Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-orphan-split.t
changeset 3542 7bd516e0a929
parent 3541 bc47c09c9782
child 3543 93deeed63908 
--- a/tests/test-evolve-orphan-split.t	Wed Mar 14 18:24:22 2018 +0530
+++ b/tests/test-evolve-orphan-split.t	Mon Mar 19 12:01:07 2018 +0100
@@ -220,7 +220,7 @@
   q: quit the prompt
   enter the index of the revision you want to select: foo
   invalid value 'foo' entered for index
-  cannot solve split across two branches
+  could solve instability, ambiguous destination: parent split across two branches
 
   $ hg evolve --all <<EOF
   > 4
@@ -232,7 +232,7 @@
   q: quit the prompt
   enter the index of the revision you want to select: 4
   invalid value '4' entered for index
-  cannot solve split across two branches
+  could solve instability, ambiguous destination: parent split across two branches
 
   $ hg evolve --all <<EOF
   > -1
@@ -244,7 +244,7 @@
   q: quit the prompt
   enter the index of the revision you want to select: -1
   invalid value '-1' entered for index
-  cannot solve split across two branches
+  could solve instability, ambiguous destination: parent split across two branches
 
   $ hg evolve --all <<EOF
   > q
@@ -255,7 +255,7 @@
   1: [7f87764e5b64] added a b c
   q: quit the prompt
   enter the index of the revision you want to select: q
-  cannot solve split across two branches
+  could solve instability, ambiguous destination: parent split across two branches
 
 Doing the evolve with the interactive prompt
evolve