~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Record a single transaction for conflicting push operations
[stgit]
/
t
/
t3103-undo-hard.sh
diff --git
a/t/t3103-undo-hard.sh
b/t/t3103-undo-hard.sh
index
2d0f382
..
df14b1f
100755
(executable)
--- a/
t/t3103-undo-hard.sh
+++ b/
t/t3103-undo-hard.sh
@@
-46,11
+46,11
@@
test_expect_success 'Try to undo without --hard' '
cat > expected.txt <<EOF
EOF
cat > expected.txt <<EOF
EOF
-test_expect_
failure
'Try to undo with --hard' '
+test_expect_
success
'Try to undo with --hard' '
stg undo --hard &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
stg undo --hard &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
- test "$(echo $(stg series))" = "
> p1 - p2 -
p3" &&
+ test "$(echo $(stg series))" = "
+ p1 + p2 >
p3" &&
test "$(stg id)" = "$(stg id $(stg top))"
'
test "$(stg id)" = "$(stg id $(stg top))"
'