tests/test-rebase-abort.t
branchstable
changeset 33121 a5abaa81fad6
parent 31226 cf8ad0e6c0e4
child 34290 4f969b9e0cf5
--- a/tests/test-rebase-abort.t	Tue Jun 27 17:39:55 2017 +0200
+++ b/tests/test-rebase-abort.t	Tue Jun 27 17:40:24 2017 +0200
@@ -374,11 +374,10 @@
   $ hg --config extensions.n=$TESTDIR/failfilemerge.py rebase -s 3 -d tip
   rebasing 3:3a71550954f1 "b"
   rebasing 4:e80b69427d80 "c"
-  transaction abort!
-  rollback completed
   abort: ^C
   [255]
   $ hg rebase --abort
+  saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg (glob)
   rebase aborted
   $ hg log -G --template "{rev} {desc} {bookmarks}"
   o  6 no-a
@@ -399,7 +398,7 @@
   parent: 0:df4f53cec30a 
    base
   branch: default
-  commit: 1 unknown (clean)
+  commit: (clean)
   update: 6 new changesets (update)
   phases: 7 draft