~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log conflicts separately
[stgit]
/
t
/
t2500-clean.sh
diff --git
a/t/t2500-clean.sh
b/t/t2500-clean.sh
index
b38d868
..
99fd29f
100755
(executable)
--- a/
t/t2500-clean.sh
+++ b/
t/t2500-clean.sh
@@
-17,11
+17,11
@@
test_expect_success 'Initialize StGit stack' '
'
test_expect_success 'Clean empty patches' '
'
test_expect_success 'Clean empty patches' '
- [ "$(echo $(stg
applied
))" = "e0 p0 e1" ] &&
- [ "$(echo $(stg
unapplied
))" = "e2" ] &&
+ [ "$(echo $(stg
series --applied --noprefix
))" = "e0 p0 e1" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "e2" ] &&
stg clean &&
stg clean &&
- [ "$(echo $(stg
applied
))" = "p0" ] &&
- [ "$(echo $(stg
unapplied
))" = "" ]
+ [ "$(echo $(stg
series --applied --noprefix
))" = "p0" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "" ]
'
test_expect_success 'Create a conflict' '
'
test_expect_success 'Create a conflict' '
@@
-32,13
+32,13
@@
test_expect_success 'Create a conflict' '
stg new p2 -m p2
echo quux > foo.txt &&
stg refresh &&
stg new p2 -m p2
echo quux > foo.txt &&
stg refresh &&
-
!
stg push
+
conflict_old
stg push
'
'
-test_expect_
failure
'Make sure conflicting patches are preserved' '
+test_expect_
success
'Make sure conflicting patches are preserved' '
stg clean &&
stg clean &&
- [ "$(echo $(stg
applied
))" = "p0 p2 p1" ] &&
- [ "$(echo $(stg
unapplied
))" = "" ]
+ [ "$(echo $(stg
series --applied --noprefix
))" = "p0 p2 p1" ] &&
+ [ "$(echo $(stg
series --unapplied --noprefix
))" = "" ]
'
test_done
'
test_done