equal
deleted
inserted
replaced
153 | | |
153 | | |
154 | x 16:43b7c338b1f8@default(draft) add c1_ |
154 | x 16:43b7c338b1f8@default(draft) add c1_ |
155 |/ |
155 |/ |
156 o 15:739f18ac1d03@default(draft) add _d |
156 o 15:739f18ac1d03@default(draft) add _d |
157 | |
157 | |
|
158 ~ |
158 |
159 |
159 Second set of stack with no successor for b2_: |
160 Second set of stack with no successor for b2_: |
160 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
161 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
161 $ mkstack "desc(_d)" b1prime b3prime >/dev/null |
162 $ mkstack "desc(_d)" b1prime b3prime >/dev/null |
162 $ hg prune "desc(b1_)" -s "desc(b1prime)" |
163 $ hg prune "desc(b1_)" -s "desc(b1prime)" |
194 | | |
195 | | |
195 | x 16:43b7c338b1f8@default(draft) add c1_ |
196 | x 16:43b7c338b1f8@default(draft) add c1_ |
196 |/ |
197 |/ |
197 o 15:739f18ac1d03@default(draft) add _d |
198 o 15:739f18ac1d03@default(draft) add _d |
198 | |
199 | |
|
200 ~ |
199 |
201 |
200 Solve the full second stack and only part of the first one |
202 Solve the full second stack and only part of the first one |
201 $ echo "(desc(_d)::) - desc(c3_)" |
203 $ echo "(desc(_d)::) - desc(c3_)" |
202 (desc(_d)::) - desc(c3_) |
204 (desc(_d)::) - desc(c3_) |
203 $ hg evolve --rev "(desc(_d)::) - desc(c3_)" |
205 $ hg evolve --rev "(desc(_d)::) - desc(c3_)" |
230 | | |
232 | | |
231 o | 22:dcf786e878fd@default(draft) add c1second |
233 o | 22:dcf786e878fd@default(draft) add c1second |
232 |/ |
234 |/ |
233 o 15:739f18ac1d03@default(draft) add _d |
235 o 15:739f18ac1d03@default(draft) add _d |
234 | |
236 | |
|
237 ~ |
235 |
238 |
236 Test multiple revision with some un-evolvable because parent is splitted |
239 Test multiple revision with some un-evolvable because parent is splitted |
237 ------------------------------------------------------------------------ |
240 ------------------------------------------------------------------------ |
238 |
241 |
239 $ hg up 'desc(c2prime)' |
242 $ hg up 'desc(c2prime)' |