chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't clean away patches with conflicts
[stgit]
/
t
/
t2500-clean.sh
diff --git
a/t/t2500-clean.sh
b/t/t2500-clean.sh
index b38d868cfef2beb2cbbd99142c5e30c45377ae46..ad8f892e624107e5c7104d4d77cd18dcbdba05ca 100755
(executable)
--- a/
t/t2500-clean.sh
+++ b/
t/t2500-clean.sh
@@
-35,7
+35,7
@@
test_expect_success 'Create a conflict' '
! stg push
'
-test_expect_
failure
'Make sure conflicting patches are preserved' '
+test_expect_
success
'Make sure conflicting patches are preserved' '
stg clean &&
[ "$(echo $(stg applied))" = "p0 p2 p1" ] &&
[ "$(echo $(stg unapplied))" = "" ]