--- a/tests/test-rebase-bookmarks.t Thu Oct 22 23:10:06 2020 -0700
+++ b/tests/test-rebase-bookmarks.t Tue Oct 27 15:33:15 2020 -0700
@@ -75,7 +75,7 @@
o 0: 1994f17a630e 'A' bookmarks: Y@diverge
$ hg rebase -s Y -d 3
- rebasing 2:49cb3485fa0c "C" (Y Z)
+ rebasing 2:49cb3485fa0c Y Z "C"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg
$ hg tglog
@@ -97,7 +97,7 @@
$ hg book W@diverge
$ hg rebase -s W -d .
- rebasing 3:41acb9dca9eb "D" (W tip)
+ rebasing 3:41acb9dca9eb tip W "D"
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
$ hg bookmarks
@@ -115,8 +115,8 @@
$ hg up -q Z
$ hg rebase -s 1 -d 3
- rebasing 1:6c81ed0049f8 "B" (X)
- rebasing 2:49cb3485fa0c "C" (Y Z)
+ rebasing 1:6c81ed0049f8 X "B"
+ rebasing 2:49cb3485fa0c Y Z "C"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
$ hg tglog
@@ -138,8 +138,8 @@
$ hg up -q X
$ hg rebase -d W
- rebasing 1:6c81ed0049f8 "B" (X)
- rebasing 2:49cb3485fa0c "C" (Y Z)
+ rebasing 1:6c81ed0049f8 X "B"
+ rebasing 2:49cb3485fa0c Y Z "C"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
$ hg tglog
@@ -169,7 +169,7 @@
$ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase --dest 4
- rebasing 3:3d5fa227f4b5 "C" (Y Z)
+ rebasing 3:3d5fa227f4b5 Y Z "C"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -179,7 +179,7 @@
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
- rebasing 3:3d5fa227f4b5 "C" (Y Z)
+ rebasing 3:3d5fa227f4b5 Y Z "C"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
$ hg tglog
@ 4: 45c0f0ec1203 'C' bookmarks: Y Z
@@ -209,7 +209,7 @@
$ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
rebasing 5:345c90f326a4 "bisect"
rebasing 6:f677a2907404 "bisect2"
- rebasing 7:325c16001345 "bisect3" (bisect tip)
+ rebasing 7:325c16001345 tip bisect "bisect3"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
Bookmark and working parent get moved even if --keep is set (issue5682)
@@ -232,7 +232,7 @@
o 0: 426bada5c675 'A' bookmarks: A
$ hg rebase -r B -d C --keep
- rebasing 1:112478962961 "B" (B)
+ rebasing 1:112478962961 B "B"
$ hg tglog
@ 3: 9769fc65c4c5 'B' bookmarks: B
|