equal
deleted
inserted
replaced
57 o 0:58663bb03074@default(draft) add aa |
57 o 0:58663bb03074@default(draft) add aa |
58 |
58 |
59 $ hg evolve --rev "0::" |
59 $ hg evolve --rev "0::" |
60 move:[2] add uu |
60 move:[2] add uu |
61 atop:[4] _pp |
61 atop:[4] _pp |
|
62 |
|
63 Split the changeset such that there's an unrelated changeset in between |
|
64 $ hg --config extensions.strip= strip 4 -q |
|
65 $ mkcommit bb |
|
66 $ printf "pp" > pp; |
|
67 $ hg add pp |
|
68 $ hg commit -m "_pp" |
|
69 $ hg prune --successor "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split |
|
70 1 changesets pruned |
|
71 1 new orphan changesets |
|
72 $ hg log -G |
|
73 @ 5:e4541785761d@default(draft) _pp |
|
74 | |
|
75 o 4:155f65ab6abc@default(draft) add bb |
|
76 | |
|
77 o 3:a7fdfda64c08@default(draft) _oo |
|
78 | |
|
79 | * 2:f52200b086ca@default(draft) add uu |
|
80 | | |
|
81 | x 1:d55647aaa0c6@default(draft) oo+pp |
|
82 |/ |
|
83 o 0:58663bb03074@default(draft) add aa |
|
84 |
|
85 $ hg evolve --rev "0::" |
|
86 move:[2] add uu |
|
87 atop:[5] _pp |