equal
deleted
inserted
replaced
40 Testing in case of split within the topic |
40 Testing in case of split within the topic |
41 |
41 |
42 $ hg stack |
42 $ hg stack |
43 ### topic: foo |
43 ### topic: foo |
44 ### target: default (branch) |
44 ### target: default (branch) |
45 t3@ Added e and f (current) |
45 s3@ Added e and f (current) |
46 t2: Added c and d |
46 s2: Added c and d |
47 t1: Added a and b |
47 s1: Added a and b |
48 t0^ Added foo (base) |
48 s0^ Added foo (base) |
49 $ hg prev |
49 $ hg prev |
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
51 [2] Added c and d |
51 [2] Added c and d |
52 |
52 |
53 $ echo 0 > num |
53 $ echo 0 > num |
84 1 new orphan changesets |
84 1 new orphan changesets |
85 |
85 |
86 $ hg stack |
86 $ hg stack |
87 ### topic: foo |
87 ### topic: foo |
88 ### target: default (branch) |
88 ### target: default (branch) |
89 t4$ Added e and f (unstable) |
89 s4$ Added e and f (unstable) |
90 t3@ split2 (current) |
90 s3@ split2 (current) |
91 t2: split1 |
91 s2: split1 |
92 t1: Added a and b |
92 s1: Added a and b |
93 t0^ Added foo (base) |
93 s0^ Added foo (base) |
94 |
94 |
95 $ hg show work |
95 $ hg show work |
96 @ 5cce (foo) split2 |
96 @ 5cce (foo) split2 |
97 o f26c (foo) split1 |
97 o f26c (foo) split1 |
98 | * f1d3 (foo) Added e and f |
98 | * f1d3 (foo) Added e and f |
127 o f360 Added foo |
127 o f360 Added foo |
128 |
128 |
129 $ hg stack |
129 $ hg stack |
130 ### topic: foo (2 heads) |
130 ### topic: foo (2 heads) |
131 ### target: default (branch), 2 behind |
131 ### target: default (branch), 2 behind |
132 t4$ Added e and f (unstable) |
132 s4$ Added e and f (unstable) |
133 t3$ split2 (unstable) |
133 s3$ split2 (unstable) |
134 t2@ split1 (current) |
134 s2@ split1 (current) |
135 t1: Added a and b |
135 s1: Added a and b |
136 t0^ Added foo (base) |
136 s0^ Added foo (base) |