~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Refactor: use mapc to set all local variables in stgit-mode
[stgit]
/
t
/
t1501-sink.sh
diff --git
a/t/t1501-sink.sh
b/t/t1501-sink.sh
index
516aa44
..
e2c65cb
100755
(executable)
--- a/
t/t1501-sink.sh
+++ b/
t/t1501-sink.sh
@@
-6,22
+6,22
@@
test_description='Test "stg sink"'
test_expect_success 'Initialize StGit stack' '
echo 0 >> f0 &&
test_expect_success 'Initialize StGit stack' '
echo 0 >> f0 &&
-
git
add f0 &&
+
stg
add f0 &&
git commit -m initial &&
echo 1 >> f1 &&
git commit -m initial &&
echo 1 >> f1 &&
-
git
add f1 &&
+
stg
add f1 &&
git commit -m p1 &&
echo 2 >> f2 &&
git commit -m p1 &&
echo 2 >> f2 &&
-
git
add f2 &&
+
stg
add f2 &&
git commit -m p2 &&
echo 3 >> f3 &&
git commit -m p2 &&
echo 3 >> f3 &&
-
git
add f3 &&
+
stg
add f3 &&
git commit -m p3 &&
echo 4 >> f4 &&
git commit -m p3 &&
echo 4 >> f4 &&
-
git
add f4 &&
+
stg
add f4 &&
git commit -m p4 &&
echo 22 >> f2 &&
git commit -m p4 &&
echo 22 >> f2 &&
-
git
add f2 &&
+
stg
add f2 &&
git commit -m p22 &&
stg init &&
stg uncommit p22 p4 p3 p2 p1 &&
git commit -m p22 &&
stg init &&
stg uncommit p22 p4 p3 p2 p1 &&
@@
-58,7
+58,7
@@
test_expect_success 'sink specified patch below a target' '
'
test_expect_success 'sink with conflict' '
'
test_expect_success 'sink with conflict' '
- conflict
_old
stg sink --to=p2 p22 &&
+ conflict stg sink --to=p2 p22 &&
test "$(echo $(stg series --applied --noprefix))" = "p1 p22" &&
test "$(echo $(stg status -c))" = "f2"
'
test "$(echo $(stg series --applied --noprefix))" = "p1 p22" &&
test "$(echo $(stg status -c))" = "f2"
'