equal
deleted
inserted
replaced
73 ### branch: foo |
73 ### branch: foo |
74 b4@ c_f (current) |
74 b4@ c_f (current) |
75 b3: c_e |
75 b3: c_e |
76 b2: c_d |
76 b2: c_d |
77 b1: c_c |
77 b1: c_c |
78 ^ c_b |
78 b0^ c_b (base) |
79 |
79 |
80 Test "t#" reference |
80 Test "t#" reference |
81 ------------------- |
81 ------------------- |
82 |
82 |
83 $ hg up b2 |
83 $ hg up b2 |
121 ### branch: foo |
121 ### branch: foo |
122 b4$ c_f (unstable) |
122 b4$ c_f (unstable) |
123 b3$ c_e (unstable) |
123 b3$ c_e (unstable) |
124 b2@ c_d (current) |
124 b2@ c_d (current) |
125 b1: c_c |
125 b1: c_c |
126 ^ c_b |
126 b0^ c_b (base) |
127 $ hg up b3 |
127 $ hg up b3 |
128 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 |
129 $ hg stack |
129 $ hg stack |
130 ### branch: foo |
130 ### branch: foo |
131 b4$ c_f (unstable) |
131 b4$ c_f (unstable) |
132 b3$ c_e (current unstable) |
132 b3$ c_e (current unstable) |
133 b2: c_d |
133 b2: c_d |
134 b1: c_c |
134 b1: c_c |
135 ^ c_b |
135 b0^ c_b (base) |
136 $ hg up b2 |
136 $ hg up b2 |
137 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
137 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
138 |
138 |
139 Also test the revset: |
139 Also test the revset: |
140 |
140 |
204 b2^ c_d (base) |
204 b2^ c_d (base) |
205 b4@ c_h (current) |
205 b4@ c_h (current) |
206 b3: c_g |
206 b3: c_g |
207 b2: c_d |
207 b2: c_d |
208 b1: c_c |
208 b1: c_c |
209 ^ c_b |
209 b0^ c_b (base) |
210 |
210 |
211 Case with multiple heads on the topic with unstability involved |
211 Case with multiple heads on the topic with unstability involved |
212 --------------------------------------------------------------- |
212 --------------------------------------------------------------- |
213 |
213 |
214 We amend the message to make sure the display base pick the right changeset |
214 We amend the message to make sure the display base pick the right changeset |
247 b2^ c_D (base) |
247 b2^ c_D (base) |
248 b4: c_h |
248 b4: c_h |
249 b3: c_g |
249 b3: c_g |
250 b2@ c_D (current) |
250 b2@ c_D (current) |
251 b1: c_c |
251 b1: c_c |
252 ^ c_b |
252 b0^ c_b (base) |
253 |
253 |
254 Check that stack doesn't show draft changesets on a branch |
254 Check that stack doesn't show draft changesets on a branch |
255 ---------------------------------------------------------- |
255 ---------------------------------------------------------- |
256 |
256 |
257 $ hg stack |
257 $ hg stack |
261 b2^ c_D (base) |
261 b2^ c_D (base) |
262 b4: c_h |
262 b4: c_h |
263 b3: c_g |
263 b3: c_g |
264 b2@ c_D (current) |
264 b2@ c_D (current) |
265 b1: c_c |
265 b1: c_c |
266 ^ c_b |
266 b0^ c_b (base) |
267 $ hg phase --public b1 |
267 $ hg phase --public b1 |
268 $ hg stack |
268 $ hg stack |
269 ### branch: foo (2 heads) |
269 ### branch: foo (2 heads) |
270 b5$ c_f (unstable) |
270 b5$ c_f (unstable) |
271 b4$ c_e (unstable) |
271 b4$ c_e (unstable) |
272 b1^ c_D (base) |
272 b1^ c_D (base) |
273 b3: c_h |
273 b3: c_h |
274 b2: c_g |
274 b2: c_g |
275 b1@ c_D (current) |
275 b1@ c_D (current) |
276 ^ c_c |
276 b0^ c_c (base) |
277 |
277 |
278 Check that stack doesn't show changeset with a topic |
278 Check that stack doesn't show changeset with a topic |
279 ---------------------------------------------------- |
279 ---------------------------------------------------- |
280 |
280 |
281 $ hg topic --rev b4::b5 sometopic |
281 $ hg topic --rev b4::b5 sometopic |
283 $ hg stack |
283 $ hg stack |
284 ### branch: foo |
284 ### branch: foo |
285 b3: c_h |
285 b3: c_h |
286 b2: c_g |
286 b2: c_g |
287 b1@ c_D (current) |
287 b1@ c_D (current) |
288 ^ c_c |
288 b0^ c_c (base) |