From: Pavel Roskin <proski@gnu.org>
Date: Fri, 25 Jan 2008 08:55:17 +0000 (-0500)
Subject: Add test to ensure that "stg clean" preserves conflicting patches
X-Git-Tag: v0.15-rc1~290
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/52e96a352da165a8b56dec8df9b026392fc8dd97?hp=52e96a352da165a8b56dec8df9b026392fc8dd97

Add test to ensure that "stg clean" preserves conflicting patches

If "stg push" fails, the subsequent "stg clean" will remove the patch
that could not be applied. I think it's wrong. Especially when doing
"stg pull", it can happen that I want to run "stg clean" to get rid of
the patches applied upstream so I can concentrate on the conflict.
Instead, the conflicting patch is removed too.

The test added by this patch should pass once the bug is fixed.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---