--- a/tests/test-bookmarks-rebase.t Wed Sep 20 07:46:55 2017 +0530
+++ b/tests/test-bookmarks-rebase.t Tue Sep 19 22:06:26 2017 -0700
@@ -37,7 +37,7 @@
rebase
$ hg rebase -s two -d one
- rebasing 3:2ae46b1d99a7 "3" (tip two)
+ rebasing 3:2ae46b1d99a7 "3" (two tip)
saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg (glob)
$ hg log
@@ -77,7 +77,7 @@
created new head
$ hg bookmark three
$ hg rebase -s three -d two
- rebasing 4:dd7c838e8362 "4" (tip three)
+ rebasing 4:dd7c838e8362 "4" (three tip)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -92,7 +92,7 @@
after aborted rebase, restoring a bookmark that has been removed should not fail
$ hg rebase -s three -d two
- rebasing 4:dd7c838e8362 "4" (tip three)
+ rebasing 4:dd7c838e8362 "4" (three tip)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)