equal
deleted
inserted
replaced
53 --------------------------------------------------------- |
53 --------------------------------------------------------- |
54 |
54 |
55 $ hg up other |
55 $ hg up other |
56 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
56 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
57 $ hg stack |
57 $ hg stack |
58 ### topic: None |
|
59 ### branch: other |
58 ### branch: other |
60 b2@ c_b (current) |
59 b2@ c_b (current) |
61 b1: c_a |
60 b1: c_a |
62 $ hg phase --public 'branch("other")' |
61 $ hg phase --public 'branch("other")' |
63 $ hg up foo |
62 $ hg up foo |
69 'hg stack' list all changeset in the topic |
68 'hg stack' list all changeset in the topic |
70 |
69 |
71 $ hg branch |
70 $ hg branch |
72 foo |
71 foo |
73 $ hg stack |
72 $ hg stack |
74 ### topic: None |
|
75 ### branch: foo |
73 ### branch: foo |
76 b4@ c_f (current) |
74 b4@ c_f (current) |
77 b3: c_e |
75 b3: c_e |
78 b2: c_d |
76 b2: c_d |
79 b1: c_c |
77 b1: c_c |
118 o 1 other {} public c_b |
116 o 1 other {} public c_b |
119 | |
117 | |
120 o 0 other {} public c_a |
118 o 0 other {} public c_a |
121 |
119 |
122 $ hg stack |
120 $ hg stack |
123 ### topic: None |
|
124 ### branch: foo |
121 ### branch: foo |
125 b4$ c_f (unstable) |
122 b4$ c_f (unstable) |
126 b3$ c_e (unstable) |
123 b3$ c_e (unstable) |
127 b2@ c_d (current) |
124 b2@ c_d (current) |
128 b1: c_c |
125 b1: c_c |
129 ^ c_b |
126 ^ c_b |
130 $ hg up b3 |
127 $ hg up b3 |
131 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
128 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
132 $ hg stack |
129 $ hg stack |
133 ### topic: None |
|
134 ### branch: foo |
130 ### branch: foo |
135 b4$ c_f (unstable) |
131 b4$ c_f (unstable) |
136 b3$ c_e (current unstable) |
132 b3$ c_e (current unstable) |
137 b2: c_d |
133 b2: c_d |
138 b1: c_c |
134 b1: c_c |
198 |
194 |
199 |
195 |
200 Test output |
196 Test output |
201 |
197 |
202 $ hg stack |
198 $ hg stack |
203 ### topic: None (2 heads) |
199 ### branch: foo (2 heads) |
204 ### branch: foo |
|
205 b6: c_f |
200 b6: c_f |
206 b5: c_e |
201 b5: c_e |
207 b2^ c_d (base) |
202 b2^ c_d (base) |
208 b4@ c_h (current) |
203 b4@ c_h (current) |
209 b3: c_g |
204 b3: c_g |
242 | |
237 | |
243 o 0 other {} public c_a |
238 o 0 other {} public c_a |
244 |
239 |
245 |
240 |
246 $ hg stack |
241 $ hg stack |
247 ### topic: None (2 heads) |
242 ### branch: foo (2 heads) |
248 ### branch: foo |
|
249 b6$ c_f (unstable) |
243 b6$ c_f (unstable) |
250 b5$ c_e (unstable) |
244 b5$ c_e (unstable) |
251 b2^ c_D (base) |
245 b2^ c_D (base) |
252 b4: c_h |
246 b4: c_h |
253 b3: c_g |
247 b3: c_g |