--- a/tests/test-rebase-bookmarks.t Sun Dec 07 20:04:45 2014 +0100
+++ b/tests/test-rebase-bookmarks.t Tue Dec 09 03:45:26 2014 +0100
@@ -74,6 +74,7 @@
o 0: 'A' bookmarks: Y@diverge
$ hg rebase -s Y -d 3
+ rebasing 2:49cb3485fa0c "C" (Y Z)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-backup.hg (glob)
$ hg tglog
@@ -95,6 +96,7 @@
$ hg book W@diverge
$ hg rebase -s W -d .
+ rebasing 3:41acb9dca9eb "D" (tip W)
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-backup.hg (glob)
$ hg bookmarks
@@ -112,6 +114,8 @@
$ hg up -q Z
$ hg rebase -s 1 -d 3
+ rebasing 1:6c81ed0049f8 "B" (X)
+ rebasing 2:49cb3485fa0c "C" (Y Z)
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
$ hg tglog
@@ -133,6 +137,8 @@
$ hg up -q X
$ hg rebase -d W
+ rebasing 1:6c81ed0049f8 "B" (X)
+ rebasing 2:49cb3485fa0c "C" (Y Z)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
$ hg tglog
@@ -162,6 +168,7 @@
$ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
+ rebasing 3:3d5fa227f4b5 "C" (Y Z)
merging c
warning: conflicts during merge.
merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -171,6 +178,7 @@
$ hg resolve --mark c
(no more unresolved files)
$ hg rebase --continue
+ rebasing 3:3d5fa227f4b5 "C" (Y Z)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
$ hg tglog
@ 4: 'C' bookmarks: Y Z
@@ -198,4 +206,7 @@
$ hg book bisect
$ hg update -q Y
$ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
+ rebasing 5:345c90f326a4 "bisect"
+ rebasing 6:f677a2907404 "bisect2"
+ rebasing 7:325c16001345 "bisect3" (tip bisect)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob)