Mercurial > evolve

comparison tests/test-stack-branch.t @ 2997:a61634f52742

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: try to clarify the "branch" part in stack The idea is to clarify the meaning of "behind" with using the "target" word.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Sep 2017 11:30:14 +0200
parents 06844693bb21
children bd7e8be29542
comparison
equal deleted inserted replaced
2996:7cc79fc0e637 2997:a61634f52742
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 ### branch: other 58 ### target: other (branch)
59 b2@ c_b (current) 59 b2@ c_b (current)
60 b1: c_a 60 b1: 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
68 'hg stack' list all changeset in the topic 68 'hg stack' list all changeset in the topic
69 69
70 $ hg branch 70 $ hg branch
71 foo 71 foo
72 $ hg stack 72 $ hg stack
73 ### branch: foo 73 ### target: foo (branch)
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 b0^ c_b (base) 78 b0^ c_b (base)
79 $ hg stack -v 79 $ hg stack -v
80 ### branch: foo 80 ### target: foo (branch)
81 b4(913c298d8b0a)@ c_f (current) 81 b4(913c298d8b0a)@ c_f (current)
82 b3(4f2a69f6d380): c_e 82 b3(4f2a69f6d380): c_e
83 b2(f61adbacd17a): c_d 83 b2(f61adbacd17a): c_d
84 b1(3e9313bc4b71): c_c 84 b1(3e9313bc4b71): c_c
85 b0(4a04f1104a27)^ c_b (base) 85 b0(4a04f1104a27)^ c_b (base)
123 o 1 other {} public c_b 123 o 1 other {} public c_b
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 ### branch: foo 128 ### target: foo (branch)
129 b4$ c_f (unstable) 129 b4$ c_f (unstable)
130 b3$ c_e (unstable) 130 b3$ c_e (unstable)
131 b2@ c_d (current) 131 b2@ c_d (current)
132 b1: c_c 132 b1: c_c
133 b0^ c_b (base) 133 b0^ 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 ### branch: foo 137 ### target: foo (branch)
138 b4$ c_f (unstable) 138 b4$ c_f (unstable)
139 b3$ c_e (current unstable) 139 b3$ c_e (current unstable)
140 b2: c_d 140 b2: c_d
141 b1: c_c 141 b1: c_c
142 b0^ c_b (base) 142 b0^ c_b (base)
203 203
204 204
205 Test output 205 Test output
206 206
207 $ hg stack 207 $ hg stack
208 ### branch: foo (2 heads) 208 ### target: foo (branch) (2 heads)
209 b6@ c_h (current) 209 b6@ c_h (current)
210 b5: c_g 210 b5: c_g
211 b2^ c_d (base) 211 b2^ c_d (base)
212 b4: c_f 212 b4: c_f
213 b3: c_e 213 b3: c_e
246 | 246 |
247 o 0 other {} public c_a 247 o 0 other {} public c_a
248 248
249 249
250 $ hg stack 250 $ hg stack
251 ### branch: foo (2 heads) 251 ### target: foo (branch) (2 heads)
252 b6: c_h 252 b6: c_h
253 b5: c_g 253 b5: c_g
254 b2^ c_D (base) 254 b2^ c_D (base)
255 b4$ c_f (unstable) 255 b4$ c_f (unstable)
256 b3$ c_e (unstable) 256 b3$ c_e (unstable)
280 | 280 |
281 o 0 other {} public c_a 281 o 0 other {} public c_a
282 282
283 283
284 $ hg stack 284 $ hg stack
285 ### branch: foo (2 heads) 285 ### target: foo (branch) (2 heads)
286 b6: c_h 286 b6: c_h
287 b5: c_g 287 b5: c_g
288 b2^ c_D (base) 288 b2^ c_D (base)
289 b4$ c_f (unstable) 289 b4$ c_f (unstable)
290 b3$ c_e (unstable) 290 b3$ c_e (unstable)
291 b2@ c_D (current) 291 b2@ c_D (current)
292 b1: c_c 292 b1: c_c
293 b0^ c_b (base) 293 b0^ c_b (base)
294 $ hg phase --public b1 294 $ hg phase --public b1
295 $ hg stack 295 $ hg stack
296 ### branch: foo (2 heads) 296 ### target: foo (branch) (2 heads)
297 b5: c_h 297 b5: c_h
298 b4: c_g 298 b4: c_g
299 b1^ c_D (base) 299 b1^ c_D (base)
300 b3$ c_f (unstable) 300 b3$ c_f (unstable)
301 b2$ c_e (unstable) 301 b2$ c_e (unstable)
306 ---------------------------------------------------- 306 ----------------------------------------------------
307 307
308 $ hg topic --rev b4::b5 sometopic 308 $ hg topic --rev b4::b5 sometopic
309 changed topic on 2 changes 309 changed topic on 2 changes
310 $ hg stack 310 $ hg stack
311 ### branch: foo 311 ### target: foo (branch)
312 b3$ c_f (unstable) 312 b3$ c_f (unstable)
313 b2$ c_e (unstable) 313 b2$ c_e (unstable)
314 b1@ c_D (current) 314 b1@ c_D (current)
315 b0^ c_c (base) 315 b0^ c_c (base)