This is the test by Pavel, followed by a fix by me.
They're in kha/safe, since they should be low-risk, and because losing
a conflicting patch (even though you still have all the changes in
your worktree) is unpleasant.
---
Karl Hasselström (1):
Don't clean away patches with conflicts
Pavel Roskin (1):
Add test to ensure that "stg clean" preserves conflicting patches
stgit/commands/clean.py | 7 +++++++
stgit/lib/git.py | 8 ++++++++
t/t2500-clean.sh | 17 +++++++++++++++++
3 files changed, 32 insertions(+), 0 deletions(-)
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
