~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log subprocess calls during performance testing
[stgit]
/
t
/
t3000-dirty-merge.sh
diff --git
a/t/t3000-dirty-merge.sh
b/t/t3000-dirty-merge.sh
index
dd81c9e
..
4dd6da3
100755
(executable)
--- a/
t/t3000-dirty-merge.sh
+++ b/
t/t3000-dirty-merge.sh
@@
-22,11
+22,11
@@
test_expect_success 'Pop one patch and update the other' '
stg refresh
'
stg refresh
'
-test_expect_
failure
'Push with dirty worktree' '
+test_expect_
success
'Push with dirty worktree' '
echo 4 > a &&
[ "$(echo $(stg applied))" = "p1" ] &&
[ "$(echo $(stg unapplied))" = "p2" ] &&
echo 4 > a &&
[ "$(echo $(stg applied))" = "p1" ] &&
[ "$(echo $(stg unapplied))" = "p2" ] &&
-
!
stg goto p2 &&
+
conflict
stg goto p2 &&
[ "$(echo $(stg applied))" = "p1" ] &&
[ "$(echo $(stg unapplied))" = "p2" ] &&
[ "$(echo $(cat a))" = "4" ]
[ "$(echo $(stg applied))" = "p1" ] &&
[ "$(echo $(stg unapplied))" = "p2" ] &&
[ "$(echo $(cat a))" = "4" ]