From: Karl Hasselström Date: Tue, 29 Jan 2008 03:10:09 GMT Subject: [StGit PATCH 0/2] "stg clean" test+bugfix Message-ID: <20080129030752.1095.27968.stgit@yoghurt> In-Reply-To: <20080129025821.GA1373@diana.vm.bytemark.co.uk> 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@treskal.com www.treskal.com/kalle