tests/test-evolve-split.t
branchstable
changeset 5206 dc3571a37b56
parent 4763 184c64c81528
child 5207 a5876853ba15
--- a/tests/test-evolve-split.t	Wed Mar 11 18:50:39 2020 +0100
+++ b/tests/test-evolve-split.t	Wed Mar 11 16:04:06 2020 +0100
@@ -59,3 +59,29 @@
   $ hg evolve --rev "0::"
   move:[2] add uu
   atop:[4] _pp
+
+Split the changeset such that there's an unrelated changeset in between
+  $ hg --config extensions.strip= strip 4 -q
+  $ mkcommit bb
+  $ printf "pp" > pp;
+  $ hg add pp
+  $ hg commit -m "_pp"
+  $ hg prune --successor "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
+  1 changesets pruned
+  1 new orphan changesets
+  $ hg log -G
+  @  5:e4541785761d@default(draft) _pp
+  |
+  o  4:155f65ab6abc@default(draft) add bb
+  |
+  o  3:a7fdfda64c08@default(draft) _oo
+  |
+  | *  2:f52200b086ca@default(draft) add uu
+  | |
+  | x  1:d55647aaa0c6@default(draft) oo+pp
+  |/
+  o  0:58663bb03074@default(draft) add aa
+  
+  $ hg evolve --rev "0::"
+  move:[2] add uu
+  atop:[5] _pp