~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'proposed' of git://github.com/gustavh/stgit
[stgit]
/
t
/
t3101-reset-hard.sh
diff --git
a/t/t3101-reset-hard.sh
b/t/t3101-reset-hard.sh
index
2807ba3
..
bd97b3a
100755
(executable)
--- a/
t/t3101-reset-hard.sh
+++ b/
t/t3101-reset-hard.sh
@@
-28,7
+28,7
@@
cat > expected.txt <<EOF
C a
EOF
test_expect_success 'Pop middle patch, creating a conflict' '
C a
EOF
test_expect_success 'Pop middle patch, creating a conflict' '
- conflict
_old
stg pop p2 &&
+ conflict stg pop p2 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
test "$(echo $(stg series))" = "+ p1 > p3 - p2"
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
test "$(echo $(stg series))" = "+ p1 > p3 - p2"
@@
-47,7
+47,7
@@
test_expect_success 'Try to reset with --hard' '
stg reset --hard master.stgit^~1 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
stg reset --hard master.stgit^~1 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
- test "$(echo $(stg series))" = "> p1 - p
3 - p2
"
+ test "$(echo $(stg series))" = "> p1 - p
2 - p3
"
'
test_done
'
test_done