329 o 0 default {} public c_a |
329 o 0 default {} public c_a |
330 |
330 |
331 $ hg topic --list |
331 $ hg topic --list |
332 ### topic: foo |
332 ### topic: foo |
333 ### target: default (branch) |
333 ### target: default (branch) |
334 s4$ c_f (unstable) |
334 s4$ c_f (orphan) |
335 s3$ c_e (unstable) |
335 s3$ c_e (orphan) |
336 s2@ c_d (current) |
336 s2@ c_d (current) |
337 s1: c_c |
337 s1: c_c |
338 s0^ c_b (base) |
338 s0^ c_b (base) |
339 $ hg up s3 |
339 $ hg up s3 |
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
341 $ hg topic --list |
341 $ hg topic --list |
342 ### topic: foo |
342 ### topic: foo |
343 ### target: default (branch) |
343 ### target: default (branch) |
344 s4$ c_f (unstable) |
344 s4$ c_f (orphan) |
345 s3$ c_e (current unstable) |
345 s3@ c_e (current orphan) |
346 s2: c_d |
346 s2: c_d |
347 s1: c_c |
347 s1: c_c |
348 s0^ c_b (base) |
348 s0^ c_b (base) |
349 $ hg topic --list --color=debug |
349 $ hg topic --list --color=debug |
350 [topic.stack.summary.topic|### topic: [topic.active|foo]] |
350 [topic.stack.summary.topic|### topic: [topic.active|foo]] |
351 [topic.stack.summary.branches|### target: default (branch)] |
351 [topic.stack.summary.branches|### target: default (branch)] |
352 [topic.stack.index topic.stack.index.unstable|s4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)] |
352 [topic.stack.index topic.stack.index.orphan|s4][topic.stack.state topic.stack.state.orphan|$] [topic.stack.desc topic.stack.desc.orphan|c_f][topic.stack.state topic.stack.state.orphan| (orphan)] |
353 [topic.stack.index topic.stack.index.current topic.stack.index.unstable|s3][topic.stack.state topic.stack.state.current topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.unstable|c_e][topic.stack.state topic.stack.state.current topic.stack.state.unstable| (current unstable)] |
353 [topic.stack.index topic.stack.index.current topic.stack.index.orphan|s3][topic.stack.state topic.stack.state.current topic.stack.state.orphan|@] [topic.stack.desc topic.stack.desc.current topic.stack.desc.orphan|c_e][topic.stack.state topic.stack.state.current topic.stack.state.orphan| (current orphan)] |
354 [topic.stack.index topic.stack.index.clean|s2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] |
354 [topic.stack.index topic.stack.index.clean|s2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] |
355 [topic.stack.index topic.stack.index.clean|s1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] |
355 [topic.stack.index topic.stack.index.clean|s1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] |
356 [topic.stack.index topic.stack.index.base|s0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] |
356 [topic.stack.index topic.stack.index.base|s0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] |
357 $ hg up s2 |
357 $ hg up s2 |
358 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
358 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
765 |
765 |
766 |
766 |
767 $ hg stack red |
767 $ hg stack red |
768 ### topic: red |
768 ### topic: red |
769 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
769 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
770 s5$ c_H (unstable) |
770 s5$ c_H (orphan) |
771 ^ c_G |
771 ^ c_G |
772 ^ c_D |
772 ^ c_D |
773 s4$ c_C (unstable) |
773 s4$ c_C (orphan) |
774 s1^ c_B (base) |
774 s1^ c_B (base) |
775 s3$ c_F (unstable) |
775 s3$ c_F (orphan) |
776 s2$ c_E (unstable) |
776 s2$ c_E (orphan) |
777 s1: c_B |
777 s1: c_B |
778 s0^ c_A (base) |
778 s0^ c_A (base) |
779 $ hg stack blue |
779 $ hg stack blue |
780 ### topic: blue |
780 ### topic: blue |
781 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
781 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
782 s3$ c_I (unstable) |
782 s3$ c_I (orphan) |
783 ^ c_H |
783 ^ c_H |
784 s2$ c_G (unstable) |
784 s2$ c_G (orphan) |
785 ^ c_F |
785 ^ c_F |
786 s1$ c_D (current unstable) |
786 s1@ c_D (current orphan) |
787 s0^ c_C (base unstable) |
787 s0^ c_C (base orphan) |
788 |
788 |
789 more obsolescence |
789 more obsolescence |
790 |
790 |
791 $ hg up 'max(desc("c_H"))' |
791 $ hg up 'max(desc("c_H"))' |
792 switching to topic red |
792 switching to topic red |
839 |
839 |
840 |
840 |
841 $ hg stack red |
841 $ hg stack red |
842 ### topic: red |
842 ### topic: red |
843 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
843 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
844 s5$ c_H (unstable) |
844 s5$ c_H (orphan) |
845 ^ c_G |
845 ^ c_G |
846 ^ c_D |
846 ^ c_D |
847 s4$ c_F (unstable) |
847 s4$ c_F (orphan) |
848 s3$ c_E (unstable) |
848 s3$ c_E (orphan) |
849 s1^ c_B (base) |
849 s1^ c_B (base) |
850 s2$ c_C (unstable) |
850 s2$ c_C (orphan) |
851 s1: c_B |
851 s1: c_B |
852 s0^ c_A (base) |
852 s0^ c_A (base) |
853 $ hg stack blue |
853 $ hg stack blue |
854 ### topic: blue |
854 ### topic: blue |
855 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
855 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
856 s3$ c_I (unstable) |
856 s3$ c_I (orphan) |
857 ^ c_H |
857 ^ c_H |
858 s2$ c_G (unstable) |
858 s2$ c_G (orphan) |
859 ^ c_F |
859 ^ c_F |
860 s1$ c_D (current unstable) |
860 s1@ c_D (current orphan) |
861 s0^ c_C (base unstable) |
861 s0^ c_C (base orphan) |
862 |
862 |
863 Test stack behavior with a split |
863 Test stack behavior with a split |
864 -------------------------------- |
864 -------------------------------- |
865 |
865 |
866 get things linear again |
866 get things linear again |