--- a/tests/test-evolve-orphan-merge.t	Mon Mar 19 13:11:55 2018 +0530
+++ b/tests/test-evolve-orphan-merge.t	Sun Mar 18 17:29:32 2018 +0530
@@ -417,21 +417,14 @@
 
 XXX: We should handle this case too
   $ hg evolve --all
-  warning: no support for evolving merge changesets with two obsolete parents yet
-  (Redo the merge (7b78a9784f3e) and use `hg prune <old> --succ <new>` to obsolete the old one)
-
-5) When one of the merge parent is pruned without a successor
--------------------------------------------------------------
+  move:[23] merged l and x
+  atop:[25] added x
+  move:[26] merged l and x
+  atop:[24] added l
+  working directory is now at adb665a78e08
 
-  $ hg prune -r 7b78a9784
-  1 changesets pruned
-
-  $ hg merge
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ hg ci -m "merged l and x"
   $ hg glog
-  @    26:47e57ebc80aa merged l and x
+  @    27:adb665a78e08 merged l and x
   |\    () draft
   | o  25:cdf6547da25f added x
   | |   () draft
@@ -440,11 +433,40 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
+  $ hg exp
+  # HG changeset patch
+  # User test
+  # Date 0 0
+  #      Thu Jan 01 00:00:00 1970 +0000
+  # Node ID adb665a78e08b962cff415301058d782086c0f33
+  # Parent  3f371171d767ef79cf85d156cf46d4035960fcf0
+  # Parent  cdf6547da25f1ca5d01102302ad713f444547b48
+  merged l and x
+  
+  diff -r 3f371171d767 -r adb665a78e08 x
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +bar
+
+  $ hg parents
+  changeset:   27:adb665a78e08
+  tag:         tip
+  parent:      24:3f371171d767
+  parent:      25:cdf6547da25f
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merged l and x
+  
+
+5) When one of the merge parent is pruned without a successor
+-------------------------------------------------------------
+
   $ hg prune -r cdf6547da25f
   1 changesets pruned
   1 new orphan changesets
   $ hg glog
-  @    26:47e57ebc80aa merged l and x
+  @    27:adb665a78e08 merged l and x
   |\    () draft
   | x  25:cdf6547da25f added x
   | |   () draft
@@ -454,12 +476,12 @@
       () draft
 
   $ hg evolve --rev .
-  move:[26] merged l and x
+  move:[27] merged l and x
   atop:[0] added hgignore
-  working directory is now at c117a030135c
+  working directory is now at fb8fe870ae7d
 
   $ hg glog
-  @    27:c117a030135c merged l and x
+  @    28:fb8fe870ae7d merged l and x
   |\    () draft
   | o  24:3f371171d767 added l
   |/    () draft
@@ -471,7 +493,7 @@
 --------------------------------------------------------------------------------
 
   $ hg glog
-  @    27:c117a030135c merged l and x
+  @    28:fb8fe870ae7d merged l and x
   |\    () draft
   | o  24:3f371171d767 added l
   |/    () draft
@@ -483,7 +505,7 @@
   1 new orphan changesets
 
   $ hg glog
-  @    27:c117a030135c merged l and x
+  @    28:fb8fe870ae7d merged l and x
   |\    () draft
   | x  24:3f371171d767 added l
   |/    () draft
@@ -511,12 +533,12 @@
 point where the other parent of merge is the first non-pruned ancestor.
 
   $ hg evolve -r .
-  move:[27] merged l and x
+  move:[28] merged l and x
   atop:[0] added hgignore
-  working directory is now at 57b29ecd607c
+  working directory is now at b61ba77b924a
 
   $ hg glog
-  @  28:57b29ecd607c merged l and x
+  @  29:b61ba77b924a merged l and x
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -530,33 +552,32 @@
   1 changesets pruned
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg glog
-  o  0:8fa14d15e168 added hgignore
-      () draft
 
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m "added foo"
   created new head
-  $ hg glog
-  @  29:f3ba8b99bb6f added foo
-      () draft
-  o  0:8fa14d15e168 added hgignore
-      () draft
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "merge commit"
+  $ hg glog
+  @    31:32beb84b9dbc merge commit
+  |\    () draft
+  | o  30:f3ba8b99bb6f added foo
+  |     () draft
+  o  0:8fa14d15e168 added hgignore
+      () draft
 
   $ hg prune -r f3ba8b99bb6f
   1 changesets pruned
   1 new orphan changesets
 
   $ hg glog
-  @    30:32beb84b9dbc merge commit
+  @    31:32beb84b9dbc merge commit
   |\    () draft
-  | x  29:f3ba8b99bb6f added foo
+  | x  30:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -574,12 +595,12 @@
 just remove that chain.
 
   $ hg evolve -r .
-  move:[30] merge commit
+  move:[31] merge commit
   atop:[-1] 
   working directory is now at d2a03dd8c951
 
   $ hg glog
-  @  31:d2a03dd8c951 merge commit
+  @  32:d2a03dd8c951 merge commit
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft