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-issue5832.t
changeset 5314 f12d2172a133
parent 5197 143ac9ac77a3 
--- a/tests/test-evolve-issue5832.t	Wed Apr 29 00:44:14 2020 +0800
+++ b/tests/test-evolve-issue5832.t	Sat Mar 21 20:36:41 2020 +0100
@@ -107,7 +107,7 @@
   move:[2] added b
   atop:[5] added a
   hg rebase -r a1da0651488c -d 7014ec2829cd
-  could not solve instability, ambiguous destination: parent split across two branches
+  could not solve instability, ambiguous destination: ancestors split across different branches
 
 Resolving instability using `hg evolve`
 
@@ -117,7 +117,7 @@
   move:[2] added b
   atop:[5] added a
   move:[4] merge commit
-  ancestor of '7235ef625ea3' split over multiple topological branches.
+  successors of ancestors of 7235ef625ea3 are on different topological branches
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
@@ -249,7 +249,7 @@
   move:[2] added b
   atop:[6] added a
   hg rebase -r a1da0651488c -d 5568b87b1491
-  could not solve instability, ambiguous destination: parent split across two branches
+  could not solve instability, ambiguous destination: ancestors split across different branches
 
   $ hg evolve --any --all --config ui.interactive=True <<EOF
   > 2
@@ -257,7 +257,7 @@
   move:[2] added b
   atop:[6] added a
   move:[4] merge commit
-  ancestor of 'cdf2ea1b9312' split over multiple topological branches.
+  successors of ancestors of cdf2ea1b9312 are on different topological branches
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
@@ -395,14 +395,14 @@
   move:[2] added b
   atop:[6] added a
   hg rebase -r a1da0651488c -d 5568b87b1491
-  could not solve instability, ambiguous destination: parent split across two branches
+  could not solve instability, ambiguous destination: ancestors split across different branches
 
   $ hg evolve --any --all --config ui.interactive=True <<EOF
   > 2
   > EOF
   move:[2] added b
   atop:[6] added a
-  ancestor of 'b9b387427a53' split over multiple topological branches.
+  successors of ancestors of b9b387427a53 are on different topological branches
   choose an evolve destination:
   1: [62fb70414f99] added c
   2: [5841d7cf9893] added d
evolve