Mercurial > hg
comparison tests/test-bheads.t @ 12072:010025717202
tests: unify test-bheads
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 27 Aug 2010 00:27:40 +0200 |
parents | tests/test-bheads@0a2762d83c53 |
children | 4134686b83e1 |
comparison
equal
deleted
inserted
replaced
12071:45ff6dcf82ea | 12072:010025717202 |
---|---|
1 $ heads() | |
2 > { | |
3 > hg heads --template '{rev}: {desc|firstline|strip} ({branches})\n' "$@" | |
4 > } | |
5 | |
6 $ hg init a | |
7 $ cd a | |
8 $ echo 'root' >root | |
9 $ hg add root | |
10 $ hg commit -m "Adding root node" | |
11 $ heads | |
12 0: Adding root node () | |
13 ------- | |
14 $ heads . | |
15 0: Adding root node () | |
16 | |
17 ======= | |
18 | |
19 $ echo 'a' >a | |
20 $ hg add a | |
21 $ hg branch a | |
22 marked working directory as branch a | |
23 $ hg commit -m "Adding a branch" | |
24 $ heads | |
25 1: Adding a branch (a) | |
26 0: Adding root node () | |
27 ------- | |
28 $ heads . | |
29 1: Adding a branch (a) | |
30 | |
31 ======= | |
32 | |
33 $ hg update -C 0 | |
34 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
35 $ echo 'b' >b | |
36 $ hg add b | |
37 $ hg branch b | |
38 marked working directory as branch b | |
39 $ hg commit -m "Adding b branch" | |
40 $ heads | |
41 2: Adding b branch (b) | |
42 1: Adding a branch (a) | |
43 0: Adding root node () | |
44 ------- | |
45 $ heads . | |
46 2: Adding b branch (b) | |
47 | |
48 ======= | |
49 | |
50 $ echo 'bh1' >bh1 | |
51 $ hg add bh1 | |
52 $ hg commit -m "Adding b branch head 1" | |
53 $ heads | |
54 3: Adding b branch head 1 (b) | |
55 1: Adding a branch (a) | |
56 0: Adding root node () | |
57 ------- | |
58 $ heads . | |
59 3: Adding b branch head 1 (b) | |
60 | |
61 ======= | |
62 | |
63 $ hg update -C 2 | |
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
65 $ echo 'bh2' >bh2 | |
66 $ hg add bh2 | |
67 $ hg commit -m "Adding b branch head 2" | |
68 created new head | |
69 $ heads | |
70 4: Adding b branch head 2 (b) | |
71 3: Adding b branch head 1 (b) | |
72 1: Adding a branch (a) | |
73 0: Adding root node () | |
74 $ heads . | |
75 4: Adding b branch head 2 (b) | |
76 3: Adding b branch head 1 (b) | |
77 | |
78 ======= | |
79 | |
80 $ hg update -C 2 | |
81 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
82 $ echo 'bh3' >bh3 | |
83 $ hg add bh3 | |
84 $ hg commit -m "Adding b branch head 3" | |
85 created new head | |
86 $ heads | |
87 5: Adding b branch head 3 (b) | |
88 4: Adding b branch head 2 (b) | |
89 3: Adding b branch head 1 (b) | |
90 1: Adding a branch (a) | |
91 0: Adding root node () | |
92 ------- | |
93 $ heads . | |
94 5: Adding b branch head 3 (b) | |
95 4: Adding b branch head 2 (b) | |
96 3: Adding b branch head 1 (b) | |
97 | |
98 ======= | |
99 | |
100 $ hg merge 4 | |
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 (branch merge, don't forget to commit) | |
103 $ hg commit -m "Merging b branch head 2 and b branch head 3" | |
104 $ heads | |
105 6: Merging b branch head 2 and b branch head 3 (b) | |
106 3: Adding b branch head 1 (b) | |
107 1: Adding a branch (a) | |
108 0: Adding root node () | |
109 ------- | |
110 $ heads . | |
111 6: Merging b branch head 2 and b branch head 3 (b) | |
112 3: Adding b branch head 1 (b) | |
113 | |
114 ======= | |
115 | |
116 $ echo 'c' >c | |
117 $ hg add c | |
118 $ hg branch c | |
119 marked working directory as branch c | |
120 $ hg commit -m "Adding c branch" | |
121 $ heads | |
122 7: Adding c branch (c) | |
123 6: Merging b branch head 2 and b branch head 3 (b) | |
124 3: Adding b branch head 1 (b) | |
125 1: Adding a branch (a) | |
126 0: Adding root node () | |
127 ------- | |
128 $ heads . | |
129 7: Adding c branch (c) | |
130 | |
131 ======= | |
132 | |
133 $ heads -r 3 . | |
134 no open branch heads found on branches c (started at 3) | |
135 $ echo $? | |
136 0 | |
137 $ heads -r 2 . | |
138 7: Adding c branch (c) | |
139 $ echo $? | |
140 0 | |
141 ------- | |
142 $ hg update -C 4 | |
143 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
144 $ echo $? | |
145 0 | |
146 ------- | |
147 $ heads -r 3 . | |
148 3: Adding b branch head 1 (b) | |
149 $ echo $? | |
150 0 | |
151 ------- | |
152 $ heads -r 2 . | |
153 6: Merging b branch head 2 and b branch head 3 (b) | |
154 3: Adding b branch head 1 (b) | |
155 $ echo $? | |
156 0 | |
157 ------- | |
158 $ heads -r 7 . | |
159 no open branch heads found on branches b (started at 7) | |
160 $ echo $? | |
161 0 | |
162 | |
163 ======= | |
164 | |
165 $ for i in 0 1 2 3 4 5 6 7; do | |
166 > hg update -C "$i" | |
167 > heads | |
168 > echo '-------' | |
169 > heads . | |
170 > echo '-------' | |
171 > done | |
172 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
173 7: Adding c branch (c) | |
174 6: Merging b branch head 2 and b branch head 3 (b) | |
175 3: Adding b branch head 1 (b) | |
176 1: Adding a branch (a) | |
177 0: Adding root node () | |
178 ------- | |
179 0: Adding root node () | |
180 ------- | |
181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
182 7: Adding c branch (c) | |
183 6: Merging b branch head 2 and b branch head 3 (b) | |
184 3: Adding b branch head 1 (b) | |
185 1: Adding a branch (a) | |
186 0: Adding root node () | |
187 ------- | |
188 1: Adding a branch (a) | |
189 ------- | |
190 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
191 7: Adding c branch (c) | |
192 6: Merging b branch head 2 and b branch head 3 (b) | |
193 3: Adding b branch head 1 (b) | |
194 1: Adding a branch (a) | |
195 0: Adding root node () | |
196 ------- | |
197 6: Merging b branch head 2 and b branch head 3 (b) | |
198 3: Adding b branch head 1 (b) | |
199 ------- | |
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
201 7: Adding c branch (c) | |
202 6: Merging b branch head 2 and b branch head 3 (b) | |
203 3: Adding b branch head 1 (b) | |
204 1: Adding a branch (a) | |
205 0: Adding root node () | |
206 ------- | |
207 6: Merging b branch head 2 and b branch head 3 (b) | |
208 3: Adding b branch head 1 (b) | |
209 ------- | |
210 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
211 7: Adding c branch (c) | |
212 6: Merging b branch head 2 and b branch head 3 (b) | |
213 3: Adding b branch head 1 (b) | |
214 1: Adding a branch (a) | |
215 0: Adding root node () | |
216 ------- | |
217 6: Merging b branch head 2 and b branch head 3 (b) | |
218 3: Adding b branch head 1 (b) | |
219 ------- | |
220 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
221 7: Adding c branch (c) | |
222 6: Merging b branch head 2 and b branch head 3 (b) | |
223 3: Adding b branch head 1 (b) | |
224 1: Adding a branch (a) | |
225 0: Adding root node () | |
226 ------- | |
227 6: Merging b branch head 2 and b branch head 3 (b) | |
228 3: Adding b branch head 1 (b) | |
229 ------- | |
230 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
231 7: Adding c branch (c) | |
232 6: Merging b branch head 2 and b branch head 3 (b) | |
233 3: Adding b branch head 1 (b) | |
234 1: Adding a branch (a) | |
235 0: Adding root node () | |
236 ------- | |
237 6: Merging b branch head 2 and b branch head 3 (b) | |
238 3: Adding b branch head 1 (b) | |
239 ------- | |
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
241 7: Adding c branch (c) | |
242 6: Merging b branch head 2 and b branch head 3 (b) | |
243 3: Adding b branch head 1 (b) | |
244 1: Adding a branch (a) | |
245 0: Adding root node () | |
246 ------- | |
247 7: Adding c branch (c) | |
248 ------- | |
249 | |
250 ======= | |
251 | |
252 $ for i in a b c z; do | |
253 > heads "$i" | |
254 > echo '-------' | |
255 > done | |
256 1: Adding a branch (a) | |
257 ------- | |
258 6: Merging b branch head 2 and b branch head 3 (b) | |
259 3: Adding b branch head 1 (b) | |
260 ------- | |
261 7: Adding c branch (c) | |
262 ------- | |
263 abort: unknown revision 'z'! | |
264 ------- | |
265 | |
266 ======= | |
267 | |
268 $ heads 0 1 2 3 4 5 6 7 | |
269 7: Adding c branch (c) | |
270 6: Merging b branch head 2 and b branch head 3 (b) | |
271 3: Adding b branch head 1 (b) | |
272 1: Adding a branch (a) | |
273 0: Adding root node () | |
274 | |
275 Topological heads: | |
276 | |
277 $ heads -t | |
278 7: Adding c branch (c) | |
279 3: Adding b branch head 1 (b) | |
280 1: Adding a branch (a) | |
281 | |
282 $ cd .. | |
283 ______________ | |
284 | |
285 "created new head" message tests | |
286 | |
287 $ hg init newheadmsg | |
288 $ cd newheadmsg | |
289 | |
290 Init: no msg | |
291 | |
292 $ echo 1 > a | |
293 $ hg ci -Am "a0: Initial root" | |
294 adding a | |
295 $ echo 2 >> a | |
296 $ hg ci -m "a1 (HN)" | |
297 | |
298 $ hg branch b | |
299 marked working directory as branch b | |
300 $ echo 1 > b | |
301 $ hg ci -Am "b2: Initial root for branch b" | |
302 adding b | |
303 $ echo 2 >> b | |
304 $ hg ci -m "b3 (HN)" | |
305 | |
306 Case NN: msg | |
307 | |
308 $ hg up -q null | |
309 $ hg branch -f b | |
310 marked working directory as branch b | |
311 $ echo 1 > bb | |
312 $ hg ci -Am "b4 (NN): new topo root for branch b" | |
313 adding bb | |
314 created new head | |
315 | |
316 Case HN: no msg | |
317 | |
318 $ echo 2 >> bb | |
319 $ hg ci -m "b5 (HN)" | |
320 | |
321 Case BN: msg | |
322 | |
323 $ hg branch -f default | |
324 marked working directory as branch default | |
325 $ echo 1 > aa | |
326 $ hg ci -Am "a6 (BN): new branch root" | |
327 adding aa | |
328 created new head | |
329 | |
330 Case CN: msg | |
331 | |
332 $ hg up -q 4 | |
333 $ echo 3 >> bbb | |
334 $ hg ci -Am "b7 (CN): regular new head" | |
335 adding bbb | |
336 created new head | |
337 | |
338 Case BB: msg | |
339 | |
340 $ hg up -q 4 | |
341 $ hg merge -q 3 | |
342 $ hg branch -f default | |
343 marked working directory as branch default | |
344 $ hg ci -m "a8 (BB): weird new branch root" | |
345 created new head | |
346 | |
347 Case CB: msg | |
348 | |
349 $ hg up -q 4 | |
350 $ hg merge -q 1 | |
351 $ hg ci -m "b9 (CB): new head from branch merge" | |
352 created new head | |
353 | |
354 Case HB: no msg | |
355 | |
356 $ hg up -q 7 | |
357 $ hg merge -q 6 | |
358 $ hg ci -m "b10 (HB): continuing head from branch merge" | |
359 | |
360 Case CC: msg | |
361 | |
362 $ hg up -q 4 | |
363 $ hg merge -q 2 | |
364 $ hg ci -m "b11 (CC): new head from merge" | |
365 created new head | |
366 | |
367 Case CH: no msg | |
368 | |
369 $ hg up -q 2 | |
370 $ hg merge -q 10 | |
371 $ hg ci -m "b12 (CH): continuing head from merge" | |
372 | |
373 Case HH: no msg | |
374 | |
375 $ hg merge -q 3 | |
376 $ hg ci -m "b12 (HH): merging two heads" | |
377 |