diff tests/test-evolve-wdir.t @ 6181:e6ae5af97683 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 08:19:44 +0300
parents c5dfbbe4363d
children e5bd76f95145
line wrap: on
line diff
--- a/tests/test-evolve-wdir.t	Tue Feb 22 08:00:24 2022 +0300
+++ b/tests/test-evolve-wdir.t	Tue Feb 22 08:19:44 2022 +0300
@@ -194,7 +194,7 @@
 
 when split csets are on multiple topological branches
   $ hg rebase -r 'max(desc(c_XYZ))' -d 'desc(u_B)'
-  rebasing 9:b7ec9e61ccbf tip "c_XYZ"
+  rebasing 9:b7ec9e61ccbf "c_XYZ" (tip)
   $ hg glog
   @  10:cadaa9246c55 (draft): c_XYZ
   |
@@ -222,7 +222,7 @@
   q: quit the prompt
   enter the index of the revision you want to select: q
   abort: user quit
-  [250]
+  [255]
 
   $ hg evolve --config ui.interactive=True << EOF
   > 1