tests/test-evolve-issue5832.t
branchstable
changeset 3901 f2b8429db565
parent 3898 93d9cde93b82
child 3930 d00f0c369bc7
child 4049 25981fae92f9
--- a/tests/test-evolve-issue5832.t	Wed Jul 25 14:47:16 2018 -0700
+++ b/tests/test-evolve-issue5832.t	Wed Jul 25 15:30:37 2018 -0700
@@ -393,8 +393,41 @@
   o  0:bde1d2b6b5e5 added base
       () draft
 
-  $ hg evolve --any --all --dry-run 2> error.log
-  [1]
-  $ tail -2 error.log
-      dependencies[dependent].remove(rev)
-  KeyError: 2
+  $ hg evolve --any --all --dry-run
+  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
+
+  $ hg evolve --any --all --config ui.interactive=True <<EOF
+  > 1
+  > EOF
+  move:[2] added b
+  atop:[6] added a
+  ancestor 'b9b387427a53' split over multiple topological branches.
+  choose an evolve destination:
+  0: [62fb70414f99] added c
+  1: [5841d7cf9893] added d
+  q: quit the prompt
+  enter the index of the revision you want to select: 1
+  move:[4] merge commit
+  atop:[8] added d
+  move:[10] merge commit
+  atop:[9] added b
+  working directory is now at 578c938ebd2e
+
+  $ hg glog
+  @    11:578c938ebd2e merge commit
+  |\    () draft
+  | o  9:da76bb7cd904 added b
+  | |   () draft
+  o |  8:5841d7cf9893 added d
+  | |   () draft
+  +---o  7:62fb70414f99 added c
+  | |     () draft
+  | o  6:5568b87b1491 added a
+  | |   () draft
+  | o  5:0a6281e212fe added l
+  |/    () draft
+  o  0:bde1d2b6b5e5 added base
+      () draft