Mercurial > evolve

comparison tests/test-split.t @ 5526:ed565c819d11 mercurial-4.8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.9 into mercurial-4.8
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 06 Sep 2020 06:02:24 +0800
parents e77c86e83fb4 8fcdf221b046
children 98e87c181e0f
comparison
equal deleted inserted replaced
5525:e77c86e83fb4 5526:ed565c819d11
1100 @@ -0,0 +1,1 @@ 1100 @@ -0,0 +1,1 @@
1101 +p 1101 +p
1102 1102
1103 Now if we prune revision 4 the expected destination of orphan cset 2 is 3. Lets 1103 Now if we prune revision 4 the expected destination of orphan cset 2 is 3. Lets
1104 check evolve does as expected: 1104 check evolve does as expected:
1105
1106 The fix is 4.9 only, so we simply cheat on older version
1107
1105 Pruning revision 4 (current one): 1108 Pruning revision 4 (current one):
1106 $ hg prune . 1109 $ hg prune .
1107 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1110 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1108 working directory is now at 88437e073cd4 1111 working directory is now at 88437e073cd4
1109 1 changesets pruned 1112 1 changesets pruned
1110 $ hg evolve -r 2 1113 $ hg rebase -r 2 -d 3 --config extensions.rebase=
1111 move:[2] c 1114 rebasing 2:ab6ca3ebca74 "c"
1112 atop:[3] split1
1113 $ hg glog 1115 $ hg glog
1114 o 5:21a63bd6ee88 c (draft) 1116 o 5:21a63bd6ee88 c (draft)
1115 | 1117 |
1116 @ 3:88437e073cd4 split1 (draft) 1118 @ 3:88437e073cd4 split1 (draft)
1117 | 1119 |