tests/test-split.t
branchmercurial-4.8
changeset 4548 d3cc1b55ad0a
parent 4511 e4fc3af2d0a9
parent 4502 84512556e148
child 4552 0eb80259f9cb
child 4671 63a816beee7e
--- a/tests/test-split.t	Sat Apr 20 03:55:04 2019 +0200
+++ b/tests/test-split.t	Sat Apr 20 03:55:06 2019 +0200
@@ -1102,15 +1102,18 @@
   
 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 now at 88437e073cd4
   1 changesets pruned
-  $ hg evolve -r 2
-  move:[2] c
-  atop:[3] split1
-  working directory is now at 21a63bd6ee88
+  $ hg rebase -r 2 -d 3 --config extensions.rebase=
+  rebasing 2:ab6ca3ebca74 "c"
+  $ hg up
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg glog
   @  5:21a63bd6ee88 c (draft)
   |