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

[stgit] / t / t2500-clean.sh

diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh
index 3364c188f034ae9f6e2229f95c69fc16f3e2d51d..b38d868cfef2beb2cbbd99142c5e30c45377ae46 100755 (executable)
--- a/t/t2500-clean.sh
+++ b/t/t2500-clean.sh
@@ -24,4 +24,21 @@ test_expect_success 'Clean empty patches' '
     [ "$(echo $(stg unapplied))" = "" ]
 '
 
+test_expect_success 'Create a conflict' '
+    stg new p1 -m p1 &&
+    echo bar > foo.txt &&
+    stg refresh &&
+    stg pop &&
+    stg new p2 -m p2
+    echo quux > foo.txt &&
+    stg refresh &&
+    ! stg push
+'
+
+test_expect_failure 'Make sure conflicting patches are preserved' '
+    stg clean &&
+    [ "$(echo $(stg applied))" = "p0 p2 p1" ] &&
+    [ "$(echo $(stg unapplied))" = "" ]
+'
+
 test_done