diff tests/test-evolve-orphan-merge.t @ 4985:2371d40f0878

tests: update now that merge.graft() doesn't set two equal parents

This is a consequence of https://phab.mercurial-scm.org/D7549.

CORE-TEST-OUTPUT-UPDATE: 32d11a23c9cf

--- a/tests/test-evolve-orphan-merge.t	Wed Dec 04 10:57:29 2019 -0800
+++ b/tests/test-evolve-orphan-merge.t	Thu Dec 05 10:04:52 2019 -0800
@@ -521,21 +521,16 @@
   $ hg evolve -r .
   move:[28] merged l and x
   atop:[0] added hgignore
-  working directory is now at b61ba77b924a
+  evolution of 28:fb8fe870ae7d created no changes to commit
+  working directory is now at 8fa14d15e168
 
   $ hg glog
-  @  29:b61ba77b924a merged l and x
-  |   () draft
-  o  0:8fa14d15e168 added hgignore
+  @  0:8fa14d15e168 added hgignore
       () draft
 
 7) When one parent is pruned without successor and has no parent
 ----------------------------------------------------------------
 
-  $ hg prune -r .
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 8fa14d15e168
-  1 changesets pruned
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
@@ -549,9 +544,9 @@
   (branch merge, don't forget to commit)
   $ hg ci -m "merge commit"
   $ hg glog
-  @    31:32beb84b9dbc merge commit
+  @    30:32beb84b9dbc merge commit
   |\    () draft
-  | o  30:f3ba8b99bb6f added foo
+  | o  29:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -561,9 +556,9 @@
   1 new orphan changesets
 
   $ hg glog
-  @    31:32beb84b9dbc merge commit
+  @    30:32beb84b9dbc merge commit
   |\    () draft
-  | x  30:f3ba8b99bb6f added foo
+  | x  29:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -581,12 +576,12 @@
 just remove that chain.
 
   $ hg evolve -r .
-  move:[31] merge commit
+  move:[30] merge commit
   atop:[-1] 
   working directory is now at d2a03dd8c951
 
   $ hg glog
-  @  32:d2a03dd8c951 merge commit
+  @  31:d2a03dd8c951 merge commit
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft