tests/test-prev-next.t
changeset 4252 a07cd1d076bb
parent 4251 a5ec7652c4f4
child 4291 8f54ab5dd4e2
--- a/tests/test-prev-next.t	Tue Nov 06 15:10:56 2018 +0530
+++ b/tests/test-prev-next.t	Tue Nov 06 10:41:50 2018 +0530
@@ -484,8 +484,8 @@
   use 'hg resolve' to retry unresolved file merges
   [2] added bar
 
-Add test which shows that `next` command get confused by split:
----------------------------------------------------------------
+Add test which shows that now `next` command does not get confused by split:
+----------------------------------------------------------------------------
   $ cd ..
   $ mkdir nextconfused
   $ cd nextconfused
@@ -584,13 +584,6 @@
   $ hg next --evolve << EOF
   > q
   > EOF
-  ambiguous next (unstable) changeset, choose one to evolve and update:
-  0: [fdc998261dcb] C
-  1: [279f6cab32b5] B
-  q: quit the prompt
-  enter the index of the revision you want to select: q
-  ambiguous next (unstable) changeset:
-  [2] C
-  [4] B
-  (run 'hg evolve --rev REV' on one of them)
-  [1]
+  move:[4] B
+  atop:[5] B modified
+  working directory now at 1b434459c7e7