~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Garbage collect selected patches on reload
[stgit]
/
t
/
t1203-push-conflict.sh
diff --git
a/t/t1203-push-conflict.sh
b/t/t1203-push-conflict.sh
index
f9537d9
..
8027e6c
100755
(executable)
--- a/
t/t1203-push-conflict.sh
+++ b/
t/t1203-push-conflict.sh
@@
-21,7
+21,7
@@
test_expect_success \
stg new foo -m foo &&
echo foo > test &&
echo fie > test2 &&
stg new foo -m foo &&
echo foo > test &&
echo fie > test2 &&
-
stg
add test test2 &&
+
git
add test test2 &&
stg refresh &&
stg pop
'
stg refresh &&
stg pop
'
@@
-31,14
+31,14
@@
test_expect_success \
'
stg new bar -m bar &&
echo bar > test &&
'
stg new bar -m bar &&
echo bar > test &&
-
stg
add test &&
+
git
add test &&
stg refresh
'
test_expect_success \
'Push the first patch with conflict' \
'
stg refresh
'
test_expect_success \
'Push the first patch with conflict' \
'
-
!
stg push foo
+
conflict
stg push foo
'
test_expect_success \
'
test_expect_success \
@@
-54,6
+54,12
@@
test_expect_success \
'
test_expect_success \
'
test_expect_success \
+ 'Check that pop will fail while there are unmerged conflicts' \
+ '
+ command_error stg pop
+ '
+
+test_expect_success \
'Resolve the conflict' \
'
echo resolved > test &&
'Resolve the conflict' \
'
echo resolved > test &&