equal
deleted
inserted
replaced
70 * other (0 changesets) |
70 * other (0 changesets) |
71 $ hg stack |
71 $ hg stack |
72 ### topic: other |
72 ### topic: other |
73 ### target: default (branch) |
73 ### target: default (branch) |
74 (stack is empty) |
74 (stack is empty) |
75 t0^ c_b (current base) |
75 t0^ c_b (base current) |
76 |
76 |
77 $ hg up foo |
77 $ hg up foo |
78 switching to topic foo |
78 switching to topic foo |
79 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 |
80 |
230 |
230 |
231 $ hg topic --clear |
231 $ hg topic --clear |
232 $ hg stack |
232 $ hg stack |
233 ### target: default (branch) |
233 ### target: default (branch) |
234 (stack is empty) |
234 (stack is empty) |
235 b0^ c_f (current base) |
235 b0^ c_f (base current) |
236 |
236 |
237 Test "t#" reference |
237 Test "t#" reference |
238 ------------------- |
238 ------------------- |
239 |
239 |
240 |
240 |
422 $ hg topic --list |
422 $ hg topic --list |
423 ### topic: foo (2 heads) |
423 ### topic: foo (2 heads) |
424 ### target: default (branch) |
424 ### target: default (branch) |
425 t6: c_h |
425 t6: c_h |
426 t5: c_g |
426 t5: c_g |
427 t2^ c_D (current base) |
427 t2^ c_D (base current) |
428 t4$ c_f (unstable) |
428 t4$ c_f (unstable) |
429 t3$ c_e (unstable) |
429 t3$ c_e (unstable) |
430 t2@ c_D (current) |
430 t2@ c_D (current) |
431 t1: c_c |
431 t1: c_c |
432 t0^ c_b (base) |
432 t0^ c_b (base) |
714 t3$ c_I (unstable) |
714 t3$ c_I (unstable) |
715 ^ c_H |
715 ^ c_H |
716 t2$ c_G (unstable) |
716 t2$ c_G (unstable) |
717 ^ c_F |
717 ^ c_F |
718 t1$ c_D (current unstable) |
718 t1$ c_D (current unstable) |
719 t0^ c_C (unstable base) |
719 t0^ c_C (base unstable) |
720 |
720 |
721 more obsolescence |
721 more obsolescence |
722 |
722 |
723 $ hg up 'max(desc("c_H"))' |
723 $ hg up 'max(desc("c_H"))' |
724 switching to topic red |
724 switching to topic red |
788 t3$ c_I (unstable) |
788 t3$ c_I (unstable) |
789 ^ c_H |
789 ^ c_H |
790 t2$ c_G (unstable) |
790 t2$ c_G (unstable) |
791 ^ c_F |
791 ^ c_F |
792 t1$ c_D (current unstable) |
792 t1$ c_D (current unstable) |
793 t0^ c_C (unstable base) |
793 t0^ c_C (base unstable) |
794 |
794 |
795 Test stack behavior with a split |
795 Test stack behavior with a split |
796 -------------------------------- |
796 -------------------------------- |
797 |
797 |
798 get things linear again |
798 get things linear again |