diff tests/test-split.t @ 5765:98e87c181e0f mercurial-4.8

test-compat: merge mercurial-4.9 into mercurial-4.8

# no-check-commit

--- a/tests/test-split.t	Sun Jan 31 15:57:57 2021 +0800
+++ b/tests/test-split.t	Sun Jan 31 16:06:16 2021 +0800
@@ -1102,14 +1102,16 @@
   
 Now if we prune revision 4 the expected destination of orphan cset 2 is 3. Lets
 check evolve does as expected:
+
+The fix is 4.9 only, so we simply cheat on older version
+
 Pruning revision 4 (current one):
   $ hg prune .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory is now at 88437e073cd4
   1 changesets pruned
-  $ hg evolve -r 2
-  move:[2] c
-  atop:[3] split1
+  $ hg rebase -r 2 -d 3 --config extensions.rebase=
+  rebasing 2:ab6ca3ebca74 "c"
   $ hg glog
   o  5:21a63bd6ee88 c (draft)
   |