diff tests/test-evolve-phase-divergence.t @ 5754:03410b04cf10 mercurial-5.6

tests: back out changeset 59b2be90e9fd
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 28 Jan 2021 18:57:48 +0800
parents 8e4f6354b316
children 82da27321e91 43c4db536990
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t	Thu Jan 28 18:48:41 2021 +0800
+++ b/tests/test-evolve-phase-divergence.t	Thu Jan 28 18:57:48 2021 +0800
@@ -578,7 +578,7 @@
 
   $ cd ../alice
   $ hg rebase -r . -d .^^^
-  rebasing 9:2352021b3785 bm tip "added x to x"
+  rebasing 9:2352021b3785 "added x to x" (bm tip)
 
   $ hg pull ../public
   pulling from ../public
@@ -707,7 +707,7 @@
   $ hg add y
   $ hg ci -m "y to y and foobar to foo"
   $ hg rebase -r . -d .^^^
-  rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo"
+  rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
 
   $ echo foo > y
   $ hg amend
@@ -814,7 +814,7 @@
   $ echo l > l
   $ hg ci -Aqm "added l to l"
   $ hg rebase -r . -d .^^^^
-  rebasing 17:f3794e5a91dc tip "added l to l"
+  rebasing 17:f3794e5a91dc "added l to l" (tip)
   $ echo kl > l
   $ echo foo > x
   $ hg add x