Mercurial > evolve
diff tests/test-split.t @ 4782:8fcdf221b046 mercurial-4.8
test-compat: merge mercurial-4.9 into mercurial-4.8
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 29 Jul 2019 14:43:12 +0200 |
parents | 63a816beee7e 5ad6d92f125c |
children | ed565c819d11 |
line wrap: on
line diff
--- a/tests/test-split.t Mon Jul 29 14:43:10 2019 +0200 +++ b/tests/test-split.t Mon Jul 29 14:43:12 2019 +0200 @@ -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) |