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 ### target: other (branch) |
58 ### target: other (branch) |
59 b2@ c_b (current) |
59 s2@ c_b (current) |
60 b1: c_a |
60 s1: c_a |
61 $ hg phase --public 'branch("other")' |
61 $ hg phase --public 'branch("other")' |
62 $ hg up foo |
62 $ hg up foo |
63 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64 |
64 |
65 Simple test |
65 Simple test |
69 |
69 |
70 $ hg branch |
70 $ hg branch |
71 foo |
71 foo |
72 $ hg stack |
72 $ hg stack |
73 ### target: foo (branch) |
73 ### target: foo (branch) |
74 b4@ c_f (current) |
74 s4@ c_f (current) |
75 b3: c_e |
75 s3: c_e |
76 b2: c_d |
76 s2: c_d |
77 b1: c_c |
77 s1: c_c |
78 b0^ c_b (base) |
78 s0^ c_b (base) |
79 $ hg stack -v |
79 $ hg stack -v |
80 ### target: foo (branch) |
80 ### target: foo (branch) |
81 b4(913c298d8b0a)@ c_f (current) |
81 s4(913c298d8b0a)@ c_f (current) |
82 b3(4f2a69f6d380): c_e |
82 s3(4f2a69f6d380): c_e |
83 b2(f61adbacd17a): c_d |
83 s2(f61adbacd17a): c_d |
84 b1(3e9313bc4b71): c_c |
84 s1(3e9313bc4b71): c_c |
85 b0(4a04f1104a27)^ c_b (base) |
85 s0(4a04f1104a27)^ c_b (base) |
86 |
86 |
87 Test "t#" reference |
87 Test "t#" reference |
88 ------------------- |
88 ------------------- |
89 |
89 |
90 $ hg up b2 |
90 $ hg up b2 |
91 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
91 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
92 $ hg up foo |
92 $ hg up foo |
93 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
94 $ hg up b42 |
94 $ hg up b42 |
95 abort: cannot resolve "b42": branch "foo" has only 4 changesets |
95 abort: cannot resolve "b42": branch "foo" has only 4 non-public changesets |
96 [255] |
96 [255] |
97 $ hg up b2 |
97 $ hg up b2 |
98 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
98 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
99 $ hg summary |
99 $ hg summary |
100 parent: 3:f61adbacd17a |
100 parent: 3:f61adbacd17a |
124 | |
124 | |
125 o 0 other {} public c_a |
125 o 0 other {} public c_a |
126 |
126 |
127 $ hg stack |
127 $ hg stack |
128 ### target: foo (branch) |
128 ### target: foo (branch) |
129 b4$ c_f (unstable) |
129 s4$ c_f (unstable) |
130 b3$ c_e (unstable) |
130 s3$ c_e (unstable) |
131 b2@ c_d (current) |
131 s2@ c_d (current) |
132 b1: c_c |
132 s1: c_c |
133 b0^ c_b (base) |
133 s0^ c_b (base) |
134 $ hg up b3 |
134 $ hg up b3 |
135 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
135 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 $ hg stack |
136 $ hg stack |
137 ### target: foo (branch) |
137 ### target: foo (branch) |
138 b4$ c_f (unstable) |
138 s4$ c_f (unstable) |
139 b3$ c_e (current unstable) |
139 s3$ c_e (current unstable) |
140 b2: c_d |
140 s2: c_d |
141 b1: c_c |
141 s1: c_c |
142 b0^ c_b (base) |
142 s0^ c_b (base) |
143 $ hg up b2 |
143 $ hg up b2 |
144 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
144 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
145 |
145 |
146 Also test the revset: |
146 Also test the revset: |
147 |
147 |
248 o 0 other {} public c_a |
248 o 0 other {} public c_a |
249 |
249 |
250 |
250 |
251 $ hg stack |
251 $ hg stack |
252 ### target: foo (branch) (2 heads) |
252 ### target: foo (branch) (2 heads) |
253 b6: c_h |
253 s6: c_h |
254 b5: c_g |
254 s5: c_g |
255 b2^ c_D (base current) |
255 s2^ c_D (base current) |
256 b4$ c_f (unstable) |
256 s4$ c_f (unstable) |
257 b3$ c_e (unstable) |
257 s3$ c_e (unstable) |
258 b2@ c_D (current) |
258 s2@ c_D (current) |
259 b1: c_c |
259 s1: c_c |
260 b0^ c_b (base) |
260 s0^ c_b (base) |
261 |
261 |
262 Check that stack doesn't show draft changesets on a branch |
262 Check that stack doesn't show draft changesets on a branch |
263 ---------------------------------------------------------- |
263 ---------------------------------------------------------- |
264 |
264 |
265 $ hg log --graph |
265 $ hg log --graph |
282 o 0 other {} public c_a |
282 o 0 other {} public c_a |
283 |
283 |
284 |
284 |
285 $ hg stack |
285 $ hg stack |
286 ### target: foo (branch) (2 heads) |
286 ### target: foo (branch) (2 heads) |
287 b6: c_h |
287 s6: c_h |
288 b5: c_g |
288 s5: c_g |
289 b2^ c_D (base current) |
289 s2^ c_D (base current) |
290 b4$ c_f (unstable) |
290 s4$ c_f (unstable) |
291 b3$ c_e (unstable) |
291 s3$ c_e (unstable) |
292 b2@ c_D (current) |
292 s2@ c_D (current) |
293 b1: c_c |
293 s1: c_c |
294 b0^ c_b (base) |
294 s0^ c_b (base) |
295 $ hg phase --public b1 |
295 $ hg phase --public b1 |
296 $ hg stack |
296 $ hg stack |
297 ### target: foo (branch) (2 heads) |
297 ### target: foo (branch) (2 heads) |
298 b5: c_h |
298 s5: c_h |
299 b4: c_g |
299 s4: c_g |
300 b1^ c_D (base current) |
300 s1^ c_D (base current) |
301 b3$ c_f (unstable) |
301 s3$ c_f (unstable) |
302 b2$ c_e (unstable) |
302 s2$ c_e (unstable) |
303 b1@ c_D (current) |
303 s1@ c_D (current) |
304 b0^ c_c (base) |
304 s0^ c_c (base) |
305 |
305 |
306 Check that stack doesn't show changeset with a topic |
306 Check that stack doesn't show changeset with a topic |
307 ---------------------------------------------------- |
307 ---------------------------------------------------- |
308 |
308 |
309 $ hg topic --rev b4::b5 sometopic |
309 $ hg topic --rev b4::b5 sometopic |
310 changed topic on 2 changes |
310 changed topic on 2 changes |
311 $ hg stack |
311 $ hg stack |
312 ### target: foo (branch) |
312 ### target: foo (branch) |
313 b3$ c_f (unstable) |
313 s3$ c_f (unstable) |
314 b2$ c_e (unstable) |
314 s2$ c_e (unstable) |
315 b1@ c_D (current) |
315 s1@ c_D (current) |
316 b0^ c_c (base) |
316 s0^ c_c (base) |