Mercurial > evolve

comparison tests/test-stack-branch.t @ 6380:130ad27064bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update headers in test-stack-branch.t This isn't test-topic-stack.t.
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 09 Jan 2023 19:44:49 +0400
parents c5848d8b664d
children 60daa7887c49
comparison
equal deleted inserted replaced
6379:c5848d8b664d 6380:130ad27064bc
55 $ hg log -r 1 -T '{rev}: {join(extras, " ")}\n' 55 $ hg log -r 1 -T '{rev}: {join(extras, " ")}\n'
56 1: branch=double//slash 56 1: branch=double//slash
57 $ hg log -r 5 -T '{rev}: {join(extras, " ")}\n' 57 $ hg log -r 5 -T '{rev}: {join(extras, " ")}\n'
58 5: branch=foo//bar 58 5: branch=foo//bar
59 59
60 Check that topic without any parent does not crash --list 60 Check that branch without any parent does not crash stack
61 --------------------------------------------------------- 61 ---------------------------------------------------------
62 62
63 $ hg up double//slash// 63 $ hg up double//slash//
64 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 64 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
65 $ hg stack 65 $ hg stack
71 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 71 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 72
73 Simple test 73 Simple test
74 ----------- 74 -----------
75 75
76 'hg stack' list all changeset in the topic 76 'hg stack' lists all changeset on the branch
77 77
78 $ hg branch 78 $ hg branch
79 foo//bar 79 foo//bar
80 $ hg stack 80 $ hg stack
81 ### target: foo//bar (branch) 81 ### target: foo//bar (branch)
90 s3(b1913e064ca1): c_e 90 s3(b1913e064ca1): c_e
91 s2(8fad7e98adf6): c_d 91 s2(8fad7e98adf6): c_d
92 s1(da14ac95d156): c_c 92 s1(da14ac95d156): c_c
93 s0(2450a061c0f0)^ c_b (base) 93 s0(2450a061c0f0)^ c_b (base)
94 94
95 Test "t#" reference 95 Test "s#" reference
96 ------------------- 96 -------------------
97 97
98 $ hg up s2 98 $ hg up s2
99 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 99 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
100 $ hg up foo//bar// 100 $ hg up foo//bar//
158 2 foo//bar {} draft c_c 158 2 foo//bar {} draft c_c
159 6 foo//bar {} draft c_d 159 6 foo//bar {} draft c_d
160 4 foo//bar {} draft c_e 160 4 foo//bar {} draft c_e
161 5 foo//bar {} draft c_f 161 5 foo//bar {} draft c_f
162 162
163 Case with multiple heads on the topic 163 Case with multiple heads on the branch
164 ------------------------------------- 164 --------------------------------------
165 165
166 Make things linear again 166 Make things linear again
167 167
168 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' 168 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
169 rebasing 4:b1913e064ca1 "c_e" 169 rebasing 4:b1913e064ca1 "c_e"
180 o 1 double//slash {} public c_b 180 o 1 double//slash {} public c_b
181 | 181 |
182 o 0 double//slash {} public c_a 182 o 0 double//slash {} public c_a
183 183
184 184
185 Create the second branch 185 Create the second head
186 186
187 $ hg up 'desc(c_d)' 187 $ hg up 'desc(c_d)'
188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
189 $ echo aaa > ggg 189 $ echo aaa > ggg
190 $ hg add ggg 190 $ hg add ggg
223 s3: c_e 223 s3: c_e
224 s2: c_d 224 s2: c_d
225 s1: c_c 225 s1: c_c
226 s0^ c_b (base) 226 s0^ c_b (base)
227 227
228 Case with multiple heads on the topic with instability involved 228 Case with multiple heads on the branch with instability involved
229 --------------------------------------------------------------- 229 ----------------------------------------------------------------
230 230
231 We amend the message to make sure the display base pick the right changeset 231 We amend the message to make sure the display base pick the right changeset
232 232
233 $ hg up 'desc(c_d)' 233 $ hg up 'desc(c_d)'
234 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 234 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
267 s3$ c_e (orphan) 267 s3$ c_e (orphan)
268 s2@ c_D (current) 268 s2@ c_D (current)
269 s1: c_c 269 s1: c_c
270 s0^ c_b (base) 270 s0^ c_b (base)
271 271
272 Check that stack doesn't show draft changesets on a branch 272 Check that stack doesn't show public changesets on a branch
273 ---------------------------------------------------------- 273 -----------------------------------------------------------
274 274
275 $ hg log --graph 275 $ hg log --graph
276 o 13 foo//bar {} draft c_h 276 o 13 foo//bar {} draft c_h
277 | 277 |
278 o 12 foo//bar {} draft c_g 278 o 12 foo//bar {} draft c_g
311 s3$ c_f (orphan) 311 s3$ c_f (orphan)
312 s2$ c_e (orphan) 312 s2$ c_e (orphan)
313 s1@ c_D (current) 313 s1@ c_D (current)
314 s0^ c_c (base) 314 s0^ c_c (base)
315 315
316 Check that stack doesn't show changeset with a topic 316 Check that stack doesn't show changesets with a topic
317 ---------------------------------------------------- 317 -----------------------------------------------------
318 318
319 $ hg topic --rev s4::s5 sometopic 319 $ hg topic --rev s4::s5 sometopic
320 changed topic on 2 changesets to "sometopic" 320 changed topic on 2 changesets to "sometopic"
321 $ hg stack 321 $ hg stack
322 ### target: foo//bar (branch) 322 ### target: foo//bar (branch)