equal
deleted
inserted
replaced
103 commit: (clean) |
103 commit: (clean) |
104 update: 2 new changesets (update) |
104 update: 2 new changesets (update) |
105 phases: 4 draft |
105 phases: 4 draft |
106 |
106 |
107 Case with some of the branch unstable |
107 Case with some of the branch unstable |
108 ------------------------------------ |
108 ------------------------------------- |
109 |
109 |
110 $ echo bbb > ddd |
110 $ echo bbb > ddd |
111 $ hg commit --amend |
111 $ hg commit --amend |
112 2 new orphan changesets |
112 2 new orphan changesets |
113 $ hg log -G |
113 $ hg log -G |
125 | |
125 | |
126 o 0 other {} public c_a |
126 o 0 other {} public c_a |
127 |
127 |
128 $ hg stack |
128 $ hg stack |
129 ### target: foo (branch) |
129 ### target: foo (branch) |
130 s4$ c_f (unstable) |
130 s4$ c_f (orphan) |
131 s3$ c_e (unstable) |
131 s3$ c_e (orphan) |
132 s2@ c_d (current) |
132 s2@ c_d (current) |
133 s1: c_c |
133 s1: c_c |
134 s0^ c_b (base) |
134 s0^ c_b (base) |
135 $ hg up b3 |
135 $ hg up b3 |
136 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
137 $ hg stack |
137 $ hg stack |
138 ### target: foo (branch) |
138 ### target: foo (branch) |
139 s4$ c_f (unstable) |
139 s4$ c_f (orphan) |
140 s3$ c_e (current unstable) |
140 s3@ c_e (current orphan) |
141 s2: c_d |
141 s2: c_d |
142 s1: c_c |
142 s1: c_c |
143 s0^ c_b (base) |
143 s0^ c_b (base) |
144 $ hg up b2 |
144 $ hg up b2 |
145 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
145 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
215 s3: c_e |
215 s3: c_e |
216 s2: c_d |
216 s2: c_d |
217 s1: c_c |
217 s1: c_c |
218 s0^ c_b (base) |
218 s0^ c_b (base) |
219 |
219 |
220 Case with multiple heads on the topic with unstability involved |
220 Case with multiple heads on the topic with instability involved |
221 --------------------------------------------------------------- |
221 --------------------------------------------------------------- |
222 |
222 |
223 We amend the message to make sure the display base pick the right changeset |
223 We amend the message to make sure the display base pick the right changeset |
224 |
224 |
225 $ hg up 'desc(c_d)' |
225 $ hg up 'desc(c_d)' |
253 $ hg stack |
253 $ hg stack |
254 ### target: foo (branch) (2 heads) |
254 ### target: foo (branch) (2 heads) |
255 s6: c_h |
255 s6: c_h |
256 s5: c_g |
256 s5: c_g |
257 s2^ c_D (base current) |
257 s2^ c_D (base current) |
258 s4$ c_f (unstable) |
258 s4$ c_f (orphan) |
259 s3$ c_e (unstable) |
259 s3$ c_e (orphan) |
260 s2@ c_D (current) |
260 s2@ c_D (current) |
261 s1: c_c |
261 s1: c_c |
262 s0^ c_b (base) |
262 s0^ c_b (base) |
263 |
263 |
264 Check that stack doesn't show draft changesets on a branch |
264 Check that stack doesn't show draft changesets on a branch |
287 $ hg stack |
287 $ hg stack |
288 ### target: foo (branch) (2 heads) |
288 ### target: foo (branch) (2 heads) |
289 s6: c_h |
289 s6: c_h |
290 s5: c_g |
290 s5: c_g |
291 s2^ c_D (base current) |
291 s2^ c_D (base current) |
292 s4$ c_f (unstable) |
292 s4$ c_f (orphan) |
293 s3$ c_e (unstable) |
293 s3$ c_e (orphan) |
294 s2@ c_D (current) |
294 s2@ c_D (current) |
295 s1: c_c |
295 s1: c_c |
296 s0^ c_b (base) |
296 s0^ c_b (base) |
297 $ hg phase --public b1 |
297 $ hg phase --public b1 |
298 $ hg stack |
298 $ hg stack |
299 ### target: foo (branch) (2 heads) |
299 ### target: foo (branch) (2 heads) |
300 s5: c_h |
300 s5: c_h |
301 s4: c_g |
301 s4: c_g |
302 s1^ c_D (base current) |
302 s1^ c_D (base current) |
303 s3$ c_f (unstable) |
303 s3$ c_f (orphan) |
304 s2$ c_e (unstable) |
304 s2$ c_e (orphan) |
305 s1@ c_D (current) |
305 s1@ c_D (current) |
306 s0^ c_c (base) |
306 s0^ c_c (base) |
307 |
307 |
308 Check that stack doesn't show changeset with a topic |
308 Check that stack doesn't show changeset with a topic |
309 ---------------------------------------------------- |
309 ---------------------------------------------------- |
310 |
310 |
311 $ hg topic --rev b4::b5 sometopic |
311 $ hg topic --rev b4::b5 sometopic |
312 changed topic on 2 changesets to "sometopic" |
312 changed topic on 2 changesets to "sometopic" |
313 $ hg stack |
313 $ hg stack |
314 ### target: foo (branch) |
314 ### target: foo (branch) |
315 s3$ c_f (unstable) |
315 s3$ c_f (orphan) |
316 s2$ c_e (unstable) |
316 s2$ c_e (orphan) |
317 s1@ c_D (current) |
317 s1@ c_D (current) |
318 s0^ c_c (base) |
318 s0^ c_c (base) |