260 ======================================= |
260 ======================================= |
261 |
261 |
262 $ hg stack bar |
262 $ hg stack bar |
263 ### topic: bar (2 heads) |
263 ### topic: bar (2 heads) |
264 ### target: default (branch) |
264 ### target: default (branch) |
265 t5: add bar_c |
265 s5: add bar_c |
266 t2^ add bar_b (base) |
266 s2^ add bar_b (base) |
267 t4$ add bar_e (unstable) |
267 s4$ add bar_e (unstable) |
268 t3: bar1_d |
268 s3: bar1_d |
269 t2: add bar_b |
269 s2: add bar_b |
270 t1: add bar_a |
270 s1: add bar_a |
271 t0^ add base_e (base) |
271 s0^ add base_e (base) |
272 $ hg stack bar -v |
272 $ hg stack bar -v |
273 ### topic: bar (2 heads) |
273 ### topic: bar (2 heads) |
274 ### target: default (branch) |
274 ### target: default (branch) |
275 t5(9cbadf11b44d): add bar_c |
275 s5(9cbadf11b44d): add bar_c |
276 t2(e555c7e8c767)^ add bar_b (base) |
276 s2(e555c7e8c767)^ add bar_b (base) |
277 t4(a920412b5a05)$ add bar_e (unstable) |
277 s4(a920412b5a05)$ add bar_e (unstable) |
278 t3(6915989374b1): bar1_d |
278 s3(6915989374b1): bar1_d |
279 t2(e555c7e8c767): add bar_b |
279 s2(e555c7e8c767): add bar_b |
280 t1(a5c2b4e00bbf): add bar_a |
280 s1(a5c2b4e00bbf): add bar_a |
281 t0(92f489a6251f)^ add base_e (base) |
281 s0(92f489a6251f)^ add base_e (base) |
282 $ hg stack baz |
282 $ hg stack baz |
283 ### topic: baz |
283 ### topic: baz |
284 ### target: default (branch), 2 behind |
284 ### target: default (branch), 2 behind |
285 t2: add baz_b |
285 s2: add baz_b |
286 t1: add baz_a |
286 s1: add baz_a |
287 t0^ add base_c (base) |
287 s0^ add base_c (base) |
288 $ hg stack foo |
288 $ hg stack foo |
289 ### topic: foo |
289 ### topic: foo |
290 ### target: lake (branch), ambiguous rebase destination - branch 'lake' has 2 heads |
290 ### target: lake (branch), ambiguous rebase destination - branch 'lake' has 2 heads |
291 t2@ add foo_b (current) |
291 s2@ add foo_b (current) |
292 t1: add foo_a |
292 s1: add foo_a |
293 t0^ add lake_a (base) |
293 s0^ add lake_a (base) |
294 $ hg stack fuz |
294 $ hg stack fuz |
295 ### topic: fuz |
295 ### topic: fuz |
296 ### target: default (branch), 1 behind |
296 ### target: default (branch), 1 behind |
297 t3$ add fuz_c (unstable) |
297 s3$ add fuz_c (unstable) |
298 t2$ add fuz_b (unstable) |
298 s2$ add fuz_b (unstable) |
299 t1: fuz1_a |
299 s1: fuz1_a |
300 t0^ add base_d (base) |
300 s0^ add base_d (base) |