42 $ hg phase --public 0 |
42 $ hg phase --public 0 |
43 $ hg up 'desc(_a)' |
43 $ hg up 'desc(_a)' |
44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
45 $ echo "aaa" > _a |
45 $ echo "aaa" > _a |
46 $ hg amend |
46 $ hg amend |
47 2 new unstable changesets |
47 2 new orphan changesets |
48 $ hg log -G |
48 $ hg log -G |
49 @ 5:12d519679175@default(draft) add _a |
49 @ 5:12d519679175@default(draft) add _a |
50 | |
50 | |
51 | o 3:4d156641b718@default(draft) add _c |
51 | o 3:4d156641b718@default(draft) add _c |
52 | | |
52 | | |
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 $ mkcommit _d |
72 $ mkcommit _d |
73 $ hg up "desc(_a)" |
73 $ hg up "desc(_a)" |
74 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
74 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
75 $ hg amend -m "aprime" |
75 $ hg amend -m "aprime" |
76 3 new unstable changesets |
76 3 new orphan changesets |
77 $ hg evolve --rev "desc(_b)" |
77 $ hg evolve --rev "desc(_b)" |
78 move:[6] add _b |
78 move:[6] add _b |
79 atop:[9] aprime |
79 atop:[9] aprime |
80 working directory is now at 476c9c052aae |
80 working directory is now at 476c9c052aae |
81 $ hg up "desc(_b) - obsolete()" |
81 $ hg up "desc(_b) - obsolete()" |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 $ hg amend -m "bprime" |
83 $ hg amend -m "bprime" |
84 $ hg up "desc(aprime)" |
84 $ hg up "desc(aprime)" |
85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
86 $ hg amend -m "asecond" |
86 $ hg amend -m "asecond" |
87 1 new unstable changesets |
87 1 new orphan changesets |
88 $ hg log -G |
88 $ hg log -G |
89 @ 12:9a584314f3f3@default(draft) asecond |
89 @ 12:9a584314f3f3@default(draft) asecond |
90 | |
90 | |
91 | o 11:a59c79776f7c@default(draft) bprime |
91 | o 11:a59c79776f7c@default(draft) bprime |
92 | | |
92 | | |
129 $ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null |
129 $ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null |
130 $ mkstack "desc(_d)" c1prime c2prime >/dev/null |
130 $ mkstack "desc(_d)" c1prime c2prime >/dev/null |
131 $ mkstack "desc(_d)" c1second >/dev/null |
131 $ mkstack "desc(_d)" c1second >/dev/null |
132 $ hg prune "desc(c1_)" -s "desc(c1prime)" |
132 $ hg prune "desc(c1_)" -s "desc(c1prime)" |
133 1 changesets pruned |
133 1 changesets pruned |
134 3 new unstable changesets |
134 3 new orphan changesets |
135 $ hg prune "desc(c2_)" -s "desc(c2prime)" |
135 $ hg prune "desc(c2_)" -s "desc(c2prime)" |
136 1 changesets pruned |
136 1 changesets pruned |
137 $ hg prune "desc(c1prime)" -s "desc(c1second)" |
137 $ hg prune "desc(c1prime)" -s "desc(c1second)" |
138 1 changesets pruned |
138 1 changesets pruned |
139 1 new unstable changesets |
139 1 new orphan changesets |
140 $ hg log -G -r "desc(_d)::" |
140 $ hg log -G -r "desc(_d)::" |
141 @ 22:dcf786e878fd@default(draft) add c1second |
141 @ 22:dcf786e878fd@default(draft) add c1second |
142 | |
142 | |
143 | o 21:507d52d715f6@default(draft) add c2prime |
143 | o 21:507d52d715f6@default(draft) add c2prime |
144 | | |
144 | | |
159 Second set of stack with no successor for b2_: |
159 Second set of stack with no successor for b2_: |
160 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
160 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
161 $ mkstack "desc(_d)" b1prime b3prime >/dev/null |
161 $ mkstack "desc(_d)" b1prime b3prime >/dev/null |
162 $ hg prune "desc(b1_)" -s "desc(b1prime)" |
162 $ hg prune "desc(b1_)" -s "desc(b1prime)" |
163 1 changesets pruned |
163 1 changesets pruned |
164 3 new unstable changesets |
164 3 new orphan changesets |
165 $ hg prune "desc(b3_)" -s "desc(b3prime)" |
165 $ hg prune "desc(b3_)" -s "desc(b3prime)" |
166 1 changesets pruned |
166 1 changesets pruned |
167 $ hg prune "desc(b2_)" |
167 $ hg prune "desc(b2_)" |
168 1 changesets pruned |
168 1 changesets pruned |
169 |
169 |
247 [29] add c2prime |
247 [29] add c2prime |
248 $ mkcommit c3part2 |
248 $ mkcommit c3part2 |
249 created new head |
249 created new head |
250 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' |
250 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' |
251 1 changesets pruned |
251 1 changesets pruned |
252 1 new unstable changesets |
252 1 new orphan changesets |
253 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' |
253 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' |
254 1 changesets pruned |
254 1 changesets pruned |
255 2 new divergent changesets |
255 2 new divergent changesets |
256 $ hg up 'desc(b3prime)' |
256 $ hg up 'desc(b3prime)' |
257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
258 $ hg amend -m 'b3second' |
258 $ hg amend -m 'b3second' |
259 1 new unstable changesets |
259 1 new orphan changesets |
260 $ hg evolve --rev "orphan()" |
260 $ hg evolve --rev "orphan()" |
261 move:[30] add b4_ |
261 move:[30] add b4_ |
262 atop:[35] b3second |
262 atop:[35] b3second |
263 skipping 0b9488394e89: divergent rewriting. can't choose destination |
263 skipping 0b9488394e89: divergent rewriting. can't choose destination |
264 working directory is now at 31809a198477 |
264 working directory is now at 31809a198477 |