equal
deleted
inserted
replaced
59 $ mkcommit baz_a |
59 $ mkcommit baz_a |
60 active topic 'baz' grew its first changeset |
60 active topic 'baz' grew its first changeset |
61 (see 'hg help topics' for more information) |
61 (see 'hg help topics' for more information) |
62 $ mkcommit baz_b |
62 $ mkcommit baz_b |
63 |
63 |
64 A simple topic with unstability |
64 A simple topic with instability |
65 |
65 |
66 $ hg up 'desc(base_d)' |
66 $ hg up 'desc(base_d)' |
67 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
67 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
68 $ hg topic fuz |
68 $ hg topic fuz |
69 marked working directory as topic: fuz |
69 marked working directory as topic: fuz |
264 $ hg stack bar |
264 $ hg stack bar |
265 ### topic: bar (2 heads) |
265 ### topic: bar (2 heads) |
266 ### target: default (branch) |
266 ### target: default (branch) |
267 s5: add bar_c |
267 s5: add bar_c |
268 s2^ add bar_b (base) |
268 s2^ add bar_b (base) |
269 s4$ add bar_e (unstable) |
269 s4$ add bar_e (orphan) |
270 s3: bar1_d |
270 s3: bar1_d |
271 s2: add bar_b |
271 s2: add bar_b |
272 s1: add bar_a |
272 s1: add bar_a |
273 s0^ add base_e (base) |
273 s0^ add base_e (base) |
274 $ hg stack bar -v |
274 $ hg stack bar -v |
275 ### topic: bar (2 heads) |
275 ### topic: bar (2 heads) |
276 ### target: default (branch) |
276 ### target: default (branch) |
277 s5(9cbadf11b44d): add bar_c |
277 s5(9cbadf11b44d): add bar_c |
278 s2(e555c7e8c767)^ add bar_b (base) |
278 s2(e555c7e8c767)^ add bar_b (base) |
279 s4(a920412b5a05)$ add bar_e (unstable) |
279 s4(a920412b5a05)$ add bar_e (orphan) |
280 s3(6915989374b1): bar1_d |
280 s3(6915989374b1): bar1_d |
281 s2(e555c7e8c767): add bar_b |
281 s2(e555c7e8c767): add bar_b |
282 s1(a5c2b4e00bbf): add bar_a |
282 s1(a5c2b4e00bbf): add bar_a |
283 s0(92f489a6251f)^ add base_e (base) |
283 s0(92f489a6251f)^ add base_e (base) |
284 $ hg stack baz |
284 $ hg stack baz |
294 s1: add foo_a |
294 s1: add foo_a |
295 s0^ add lake_a (base) |
295 s0^ add lake_a (base) |
296 $ hg stack fuz |
296 $ hg stack fuz |
297 ### topic: fuz |
297 ### topic: fuz |
298 ### target: default (branch), 1 behind |
298 ### target: default (branch), 1 behind |
299 s3$ add fuz_c (unstable) |
299 s3$ add fuz_c (orphan) |
300 s2$ add fuz_b (unstable) |
300 s2$ add fuz_b (orphan) |
301 s1: fuz1_a |
301 s1: fuz1_a |
302 s0^ add base_d (base) |
302 s0^ add base_d (base) |