diff -r 96fcc37a9c80 -r f90a5c211251 tests/test-bookmarks-rebase.t --- a/tests/test-bookmarks-rebase.t Thu Oct 22 23:10:06 2020 -0700 +++ b/tests/test-bookmarks-rebase.t Tue Oct 27 15:33:15 2020 -0700 @@ -37,7 +37,7 @@ rebase $ hg rebase -s two -d one - rebasing 3:2ae46b1d99a7 "3" (two tip) + rebasing 3:2ae46b1d99a7 tip two "3" saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg $ hg log @@ -77,7 +77,7 @@ created new head $ hg bookmark three $ hg rebase -s three -d two - rebasing 4:dd7c838e8362 "4" (three tip) + rebasing 4:dd7c838e8362 tip three "4" 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" (three tip) + rebasing 4:dd7c838e8362 tip three "4" merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')