changeset 5157:f4f2cc332bb7 mercurial-5.2

test-compat: back out changeset 2371d40f0878

--- a/tests/test-evolve-orphan-merge.t	Fri Feb 28 21:44:36 2020 +0700
+++ b/tests/test-evolve-orphan-merge.t	Fri Feb 28 22:48:46 2020 +0700
@@ -521,16 +521,21 @@
   $ hg evolve -r .
   move:[28] merged l and x
   atop:[0] added hgignore
-  evolution of 28:fb8fe870ae7d created no changes to commit
-  working directory is now at 8fa14d15e168
+  working directory is now at b61ba77b924a
 
   $ hg glog
-  @  0:8fa14d15e168 added hgignore
+  @  29:b61ba77b924a merged l and x
+  |   () draft
+  o  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
 
@@ -544,9 +549,9 @@
   (branch merge, don't forget to commit)
   $ hg ci -m "merge commit"
   $ hg glog
-  @    30:32beb84b9dbc merge commit
+  @    31:32beb84b9dbc merge commit
   |\    () draft
-  | o  29:f3ba8b99bb6f added foo
+  | o  30:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -556,9 +561,9 @@
   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
@@ -576,12 +581,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