diff tests/test-evolve-orphan-merge.t @ 5099:dd9037486a90 mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1

--- a/tests/test-evolve-orphan-merge.t	Thu Jan 23 17:40:51 2020 +0700
+++ b/tests/test-evolve-orphan-merge.t	Thu Jan 30 14:32:04 2020 +0700
@@ -529,13 +529,17 @@
 case where merge commit becomes orphan with its ancestors pruned up until a
 point where the other parent of merge is the first non-pruned ancestor.
 
-  $ hg evolve -r .
+Note: allowing an empty commit here to have the same output on all hg versions.
+In newer versions or Mercurial this command would not create a new commit.
+hg <= 5.2 (32d11a23c9cf)
+
+  $ hg evolve -r . --config ui.allowemptycommit=true
   move:[28] merged l and x
   atop:[0] added hgignore
-  working directory is now at b61ba77b924a
+  working directory is now at * (glob)
 
   $ hg glog
-  @  29:b61ba77b924a merged l and x
+  @  29:* merged l and x (glob)
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft