Mercurial > evolve
comparison tests/test-evolve-templates.t @ 2531:d3d686f05458 mercurial-4.1
test-compat: merge with stable
Nothing special to report, minor test-metaedit.t output change.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 31 May 2017 14:21:18 +0200 |
parents | d5db7464676d |
children | ca157d06b2dc abe6dfbdc744 |
comparison
equal
deleted
inserted
replaced
2466:e5e502407ab0 | 2531:d3d686f05458 |
---|---|
1 This test file test the various templates for precursors and successors. | |
2 | |
3 Global setup | |
4 ============ | |
5 | |
6 $ . $TESTDIR/testlib/common.sh | |
7 $ cat >> $HGRCPATH <<EOF | |
8 > [ui] | |
9 > interactive = true | |
10 > [phases] | |
11 > publish=False | |
12 > [extensions] | |
13 > evolve = | |
14 > [alias] | |
15 > tlog = log -G -T '{node|short}\ | |
16 > {if(precursors, "\n Precursors: {precursors}")}\ | |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ | |
18 > {if(successors, "\n Successors: {successors}")}\ | |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ | |
20 > {if(successors, "\n Fate: {obsfate_quiet}")}\n' | |
21 > EOF | |
22 | |
23 Test templates on amended commit | |
24 ================================ | |
25 | |
26 Test setup | |
27 ---------- | |
28 | |
29 $ hg init $TESTTMP/templates-local-amend | |
30 $ cd $TESTTMP/templates-local-amend | |
31 $ mkcommit ROOT | |
32 $ mkcommit A0 | |
33 $ echo 42 >> A0 | |
34 $ hg amend -m "A1" | |
35 $ hg amend -m "A2" | |
36 $ hg log --hidden -G | |
37 @ changeset: 4:d004c8f274b9 | |
38 | tag: tip | |
39 | parent: 0:ea207398892e | |
40 | user: test | |
41 | date: Thu Jan 01 00:00:00 1970 +0000 | |
42 | summary: A2 | |
43 | | |
44 | x changeset: 3:a468dc9b3633 | |
45 |/ parent: 0:ea207398892e | |
46 | user: test | |
47 | date: Thu Jan 01 00:00:00 1970 +0000 | |
48 | summary: A1 | |
49 | | |
50 | x changeset: 2:f137d23bb3e1 | |
51 | | user: test | |
52 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
53 | | summary: temporary amend commit for 471f378eab4c | |
54 | | | |
55 | x changeset: 1:471f378eab4c | |
56 |/ user: test | |
57 | date: Thu Jan 01 00:00:00 1970 +0000 | |
58 | summary: A0 | |
59 | | |
60 o changeset: 0:ea207398892e | |
61 user: test | |
62 date: Thu Jan 01 00:00:00 1970 +0000 | |
63 summary: ROOT | |
64 | |
65 Check templates | |
66 --------------- | |
67 $ hg up 'desc(A0)' --hidden | |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
69 working directory parent is obsolete! (471f378eab4c) | |
70 (use 'hg evolve' to update to its successor: d004c8f274b9) | |
71 | |
72 Precursors template should show current revision as it is the working copy | |
73 $ hg tlog | |
74 o d004c8f274b9 | |
75 | Precursors: 471f378eab4c | |
76 | semi-colon: 471f378eab4c | |
77 | @ 471f378eab4c | |
78 |/ Successors: [d004c8f274b9] | |
79 | semi-colon: [d004c8f274b9] | |
80 | Fate: superseed as d004c8f274b9 | |
81 o ea207398892e | |
82 | |
83 $ hg up 'desc(A1)' --hidden | |
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 working directory parent is obsolete! (a468dc9b3633) | |
86 (use 'hg evolve' to update to its successor: d004c8f274b9) | |
87 | |
88 Precursors template should show current revision as it is the working copy | |
89 $ hg tlog | |
90 o d004c8f274b9 | |
91 | Precursors: a468dc9b3633 | |
92 | semi-colon: a468dc9b3633 | |
93 | @ a468dc9b3633 | |
94 |/ Successors: [d004c8f274b9] | |
95 | semi-colon: [d004c8f274b9] | |
96 | Fate: superseed as d004c8f274b9 | |
97 o ea207398892e | |
98 | |
99 Precursors template should show the precursor as we force its display with | |
100 --hidden | |
101 $ hg tlog --hidden | |
102 o d004c8f274b9 | |
103 | Precursors: a468dc9b3633 | |
104 | semi-colon: a468dc9b3633 | |
105 | @ a468dc9b3633 | |
106 |/ Precursors: 471f378eab4c | |
107 | semi-colon: 471f378eab4c | |
108 | Successors: [d004c8f274b9] | |
109 | semi-colon: [d004c8f274b9] | |
110 | Fate: superseed as d004c8f274b9 | |
111 | x f137d23bb3e1 | |
112 | | | |
113 | x 471f378eab4c | |
114 |/ Successors: [a468dc9b3633] | |
115 | semi-colon: [a468dc9b3633] | |
116 | Fate: superseed as a468dc9b3633 | |
117 o ea207398892e | |
118 | |
119 | |
120 $ hg up 'desc(A2)' | |
121 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 $ hg tlog | |
123 @ d004c8f274b9 | |
124 | | |
125 o ea207398892e | |
126 | |
127 $ hg tlog --hidden | |
128 @ d004c8f274b9 | |
129 | Precursors: a468dc9b3633 | |
130 | semi-colon: a468dc9b3633 | |
131 | x a468dc9b3633 | |
132 |/ Precursors: 471f378eab4c | |
133 | semi-colon: 471f378eab4c | |
134 | Successors: [d004c8f274b9] | |
135 | semi-colon: [d004c8f274b9] | |
136 | Fate: superseed as d004c8f274b9 | |
137 | x f137d23bb3e1 | |
138 | | | |
139 | x 471f378eab4c | |
140 |/ Successors: [a468dc9b3633] | |
141 | semi-colon: [a468dc9b3633] | |
142 | Fate: superseed as a468dc9b3633 | |
143 o ea207398892e | |
144 | |
145 | |
146 Test templates with splitted commit | |
147 =================================== | |
148 | |
149 $ hg init $TESTTMP/templates-local-split | |
150 $ cd $TESTTMP/templates-local-split | |
151 $ mkcommit ROOT | |
152 $ echo 42 >> a | |
153 $ echo 43 >> b | |
154 $ hg commit -A -m "A0" | |
155 adding a | |
156 adding b | |
157 $ hg log --hidden -G | |
158 @ changeset: 1:471597cad322 | |
159 | tag: tip | |
160 | user: test | |
161 | date: Thu Jan 01 00:00:00 1970 +0000 | |
162 | summary: A0 | |
163 | | |
164 o changeset: 0:ea207398892e | |
165 user: test | |
166 date: Thu Jan 01 00:00:00 1970 +0000 | |
167 summary: ROOT | |
168 | |
169 $ hg split -r 'desc(A0)' -d "0 0" << EOF | |
170 > y | |
171 > y | |
172 > n | |
173 > n | |
174 > y | |
175 > y | |
176 > EOF | |
177 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
178 adding a | |
179 adding b | |
180 diff --git a/a b/a | |
181 new file mode 100644 | |
182 examine changes to 'a'? [Ynesfdaq?] y | |
183 | |
184 @@ -0,0 +1,1 @@ | |
185 +42 | |
186 record change 1/2 to 'a'? [Ynesfdaq?] y | |
187 | |
188 diff --git a/b b/b | |
189 new file mode 100644 | |
190 examine changes to 'b'? [Ynesfdaq?] n | |
191 | |
192 created new head | |
193 Done splitting? [yN] n | |
194 diff --git a/b b/b | |
195 new file mode 100644 | |
196 examine changes to 'b'? [Ynesfdaq?] y | |
197 | |
198 @@ -0,0 +1,1 @@ | |
199 +43 | |
200 record this change to 'b'? [Ynesfdaq?] y | |
201 | |
202 no more change to split | |
203 | |
204 $ hg log --hidden -G | |
205 @ changeset: 3:f257fde29c7a | |
206 | tag: tip | |
207 | user: test | |
208 | date: Thu Jan 01 00:00:00 1970 +0000 | |
209 | summary: A0 | |
210 | | |
211 o changeset: 2:337fec4d2edc | |
212 | parent: 0:ea207398892e | |
213 | user: test | |
214 | date: Thu Jan 01 00:00:00 1970 +0000 | |
215 | summary: A0 | |
216 | | |
217 | x changeset: 1:471597cad322 | |
218 |/ user: test | |
219 | date: Thu Jan 01 00:00:00 1970 +0000 | |
220 | summary: A0 | |
221 | | |
222 o changeset: 0:ea207398892e | |
223 user: test | |
224 date: Thu Jan 01 00:00:00 1970 +0000 | |
225 summary: ROOT | |
226 | |
227 | |
228 Check templates | |
229 --------------- | |
230 | |
231 $ hg up 'obsolete()' --hidden | |
232 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
233 working directory parent is obsolete! (471597cad322) | |
234 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) | |
235 | |
236 Precursors template should show current revision as it is the working copy | |
237 $ hg tlog | |
238 o f257fde29c7a | |
239 | Precursors: 471597cad322 | |
240 | semi-colon: 471597cad322 | |
241 o 337fec4d2edc | |
242 | Precursors: 471597cad322 | |
243 | semi-colon: 471597cad322 | |
244 | @ 471597cad322 | |
245 |/ Successors: [337fec4d2edc, f257fde29c7a] | |
246 | semi-colon: [337fec4d2edc, f257fde29c7a] | |
247 | Fate: superseed as 337fec4d2edc,f257fde29c7a | |
248 o ea207398892e | |
249 | |
250 $ hg up f257fde29c7a | |
251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
252 | |
253 Precursors template should not show a precursor as it's not displayed in the | |
254 log | |
255 $ hg tlog | |
256 @ f257fde29c7a | |
257 | | |
258 o 337fec4d2edc | |
259 | | |
260 o ea207398892e | |
261 | |
262 Precursors template should show the precursor as we force its display with | |
263 --hidden | |
264 $ hg tlog --hidden | |
265 @ f257fde29c7a | |
266 | Precursors: 471597cad322 | |
267 | semi-colon: 471597cad322 | |
268 o 337fec4d2edc | |
269 | Precursors: 471597cad322 | |
270 | semi-colon: 471597cad322 | |
271 | x 471597cad322 | |
272 |/ Successors: [337fec4d2edc, f257fde29c7a] | |
273 | semi-colon: [337fec4d2edc, f257fde29c7a] | |
274 | Fate: superseed as 337fec4d2edc,f257fde29c7a | |
275 o ea207398892e | |
276 | |
277 Test templates with folded commit | |
278 ============================== | |
279 | |
280 Test setup | |
281 ---------- | |
282 | |
283 $ hg init $TESTTMP/templates-local-fold | |
284 $ cd $TESTTMP/templates-local-fold | |
285 $ mkcommit ROOT | |
286 $ mkcommit A0 | |
287 $ mkcommit B0 | |
288 $ hg log --hidden -G | |
289 @ changeset: 2:0dec01379d3b | |
290 | tag: tip | |
291 | user: test | |
292 | date: Thu Jan 01 00:00:00 1970 +0000 | |
293 | summary: B0 | |
294 | | |
295 o changeset: 1:471f378eab4c | |
296 | user: test | |
297 | date: Thu Jan 01 00:00:00 1970 +0000 | |
298 | summary: A0 | |
299 | | |
300 o changeset: 0:ea207398892e | |
301 user: test | |
302 date: Thu Jan 01 00:00:00 1970 +0000 | |
303 summary: ROOT | |
304 | |
305 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" | |
306 2 changesets folded | |
307 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
308 $ hg log --hidden -G | |
309 @ changeset: 3:eb5a0daa2192 | |
310 | tag: tip | |
311 | parent: 0:ea207398892e | |
312 | user: test | |
313 | date: Thu Jan 01 00:00:00 1970 +0000 | |
314 | summary: C0 | |
315 | | |
316 | x changeset: 2:0dec01379d3b | |
317 | | user: test | |
318 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
319 | | summary: B0 | |
320 | | | |
321 | x changeset: 1:471f378eab4c | |
322 |/ user: test | |
323 | date: Thu Jan 01 00:00:00 1970 +0000 | |
324 | summary: A0 | |
325 | | |
326 o changeset: 0:ea207398892e | |
327 user: test | |
328 date: Thu Jan 01 00:00:00 1970 +0000 | |
329 summary: ROOT | |
330 | |
331 Check templates | |
332 --------------- | |
333 | |
334 $ hg up 'desc(A0)' --hidden | |
335 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
336 working directory parent is obsolete! (471f378eab4c) | |
337 (use 'hg evolve' to update to its successor: eb5a0daa2192) | |
338 | |
339 Precursors template should show current revision as it is the working copy | |
340 $ hg tlog | |
341 o eb5a0daa2192 | |
342 | Precursors: 471f378eab4c | |
343 | semi-colon: 471f378eab4c | |
344 | @ 471f378eab4c | |
345 |/ Successors: [eb5a0daa2192] | |
346 | semi-colon: [eb5a0daa2192] | |
347 | Fate: superseed as eb5a0daa2192 | |
348 o ea207398892e | |
349 | |
350 $ hg up 'desc(B0)' --hidden | |
351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
352 working directory parent is obsolete! (0dec01379d3b) | |
353 (use 'hg evolve' to update to its successor: eb5a0daa2192) | |
354 | |
355 Precursors template should show both precursors as they should be both | |
356 displayed | |
357 $ hg tlog | |
358 o eb5a0daa2192 | |
359 | Precursors: 0dec01379d3b 471f378eab4c | |
360 | semi-colon: 0dec01379d3b; 471f378eab4c | |
361 | @ 0dec01379d3b | |
362 | | Successors: [eb5a0daa2192] | |
363 | | semi-colon: [eb5a0daa2192] | |
364 | | Fate: superseed as eb5a0daa2192 | |
365 | x 471f378eab4c | |
366 |/ Successors: [eb5a0daa2192] | |
367 | semi-colon: [eb5a0daa2192] | |
368 | Fate: superseed as eb5a0daa2192 | |
369 o ea207398892e | |
370 | |
371 $ hg up 'desc(C0)' | |
372 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
373 | |
374 Precursors template should not show precursors as it's not displayed in the | |
375 log | |
376 $ hg tlog | |
377 @ eb5a0daa2192 | |
378 | | |
379 o ea207398892e | |
380 | |
381 Precursors template should show both precursors as we force its display with | |
382 --hidden | |
383 $ hg tlog --hidden | |
384 @ eb5a0daa2192 | |
385 | Precursors: 0dec01379d3b 471f378eab4c | |
386 | semi-colon: 0dec01379d3b; 471f378eab4c | |
387 | x 0dec01379d3b | |
388 | | Successors: [eb5a0daa2192] | |
389 | | semi-colon: [eb5a0daa2192] | |
390 | | Fate: superseed as eb5a0daa2192 | |
391 | x 471f378eab4c | |
392 |/ Successors: [eb5a0daa2192] | |
393 | semi-colon: [eb5a0daa2192] | |
394 | Fate: superseed as eb5a0daa2192 | |
395 o ea207398892e | |
396 | |
397 | |
398 Test templates with divergence | |
399 ============================== | |
400 | |
401 Test setup | |
402 ---------- | |
403 | |
404 $ hg init $TESTTMP/templates-local-divergence | |
405 $ cd $TESTTMP/templates-local-divergence | |
406 $ mkcommit ROOT | |
407 $ mkcommit A0 | |
408 $ hg amend -m "A1" | |
409 $ hg log --hidden -G | |
410 @ changeset: 2:fdf9bde5129a | |
411 | tag: tip | |
412 | parent: 0:ea207398892e | |
413 | user: test | |
414 | date: Thu Jan 01 00:00:00 1970 +0000 | |
415 | summary: A1 | |
416 | | |
417 | x changeset: 1:471f378eab4c | |
418 |/ user: test | |
419 | date: Thu Jan 01 00:00:00 1970 +0000 | |
420 | summary: A0 | |
421 | | |
422 o changeset: 0:ea207398892e | |
423 user: test | |
424 date: Thu Jan 01 00:00:00 1970 +0000 | |
425 summary: ROOT | |
426 | |
427 $ hg update --hidden 'desc(A0)' | |
428 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
429 working directory parent is obsolete! (471f378eab4c) | |
430 (use 'hg evolve' to update to its successor: fdf9bde5129a) | |
431 $ hg amend -m "A2" | |
432 2 new divergent changesets | |
433 $ hg log --hidden -G | |
434 @ changeset: 3:65b757b745b9 | |
435 | tag: tip | |
436 | parent: 0:ea207398892e | |
437 | user: test | |
438 | date: Thu Jan 01 00:00:00 1970 +0000 | |
439 | trouble: divergent | |
440 | summary: A2 | |
441 | | |
442 | o changeset: 2:fdf9bde5129a | |
443 |/ parent: 0:ea207398892e | |
444 | user: test | |
445 | date: Thu Jan 01 00:00:00 1970 +0000 | |
446 | trouble: divergent | |
447 | summary: A1 | |
448 | | |
449 | x changeset: 1:471f378eab4c | |
450 |/ user: test | |
451 | date: Thu Jan 01 00:00:00 1970 +0000 | |
452 | summary: A0 | |
453 | | |
454 o changeset: 0:ea207398892e | |
455 user: test | |
456 date: Thu Jan 01 00:00:00 1970 +0000 | |
457 summary: ROOT | |
458 | |
459 $ hg amend -m 'A3' | |
460 | |
461 Check templates | |
462 --------------- | |
463 | |
464 $ hg up 'desc(A0)' --hidden | |
465 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
466 working directory parent is obsolete! (471f378eab4c) | |
467 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) | |
468 | |
469 Precursors template should show current revision as it is the working copy | |
470 $ hg tlog | |
471 o 019fadeab383 | |
472 | Precursors: 471f378eab4c | |
473 | semi-colon: 471f378eab4c | |
474 | o fdf9bde5129a | |
475 |/ Precursors: 471f378eab4c | |
476 | semi-colon: 471f378eab4c | |
477 | @ 471f378eab4c | |
478 |/ Successors: [fdf9bde5129a], [019fadeab383] | |
479 | semi-colon: [fdf9bde5129a]; [019fadeab383] | |
480 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 | |
481 o ea207398892e | |
482 | |
483 $ hg up 'desc(A1)' | |
484 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
485 Precursors template should not show precursors as it's not displayed in the | |
486 log | |
487 $ hg tlog | |
488 o 019fadeab383 | |
489 | | |
490 | @ fdf9bde5129a | |
491 |/ | |
492 o ea207398892e | |
493 | |
494 Precursors template should a precursor as we force its display with --hidden | |
495 $ hg tlog --hidden | |
496 o 019fadeab383 | |
497 | Precursors: 65b757b745b9 | |
498 | semi-colon: 65b757b745b9 | |
499 | x 65b757b745b9 | |
500 |/ Precursors: 471f378eab4c | |
501 | semi-colon: 471f378eab4c | |
502 | Successors: [019fadeab383] | |
503 | semi-colon: [019fadeab383] | |
504 | Fate: superseed as 019fadeab383 | |
505 | @ fdf9bde5129a | |
506 |/ Precursors: 471f378eab4c | |
507 | semi-colon: 471f378eab4c | |
508 | x 471f378eab4c | |
509 |/ Successors: [fdf9bde5129a], [65b757b745b9] | |
510 | semi-colon: [fdf9bde5129a]; [65b757b745b9] | |
511 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 | |
512 o ea207398892e | |
513 | |
514 Test templates with amended + folded commit | |
515 =========================================== | |
516 | |
517 Test setup | |
518 ---------- | |
519 | |
520 $ hg init $TESTTMP/templates-local-amend-fold | |
521 $ cd $TESTTMP/templates-local-amend-fold | |
522 $ mkcommit ROOT | |
523 $ mkcommit A0 | |
524 $ mkcommit B0 | |
525 $ hg amend -m "B1" | |
526 $ hg log --hidden -G | |
527 @ changeset: 3:b7ea6d14e664 | |
528 | tag: tip | |
529 | parent: 1:471f378eab4c | |
530 | user: test | |
531 | date: Thu Jan 01 00:00:00 1970 +0000 | |
532 | summary: B1 | |
533 | | |
534 | x changeset: 2:0dec01379d3b | |
535 |/ user: test | |
536 | date: Thu Jan 01 00:00:00 1970 +0000 | |
537 | summary: B0 | |
538 | | |
539 o changeset: 1:471f378eab4c | |
540 | user: test | |
541 | date: Thu Jan 01 00:00:00 1970 +0000 | |
542 | summary: A0 | |
543 | | |
544 o changeset: 0:ea207398892e | |
545 user: test | |
546 date: Thu Jan 01 00:00:00 1970 +0000 | |
547 summary: ROOT | |
548 | |
549 $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0" | |
550 2 changesets folded | |
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
552 $ hg log --hidden -G | |
553 @ changeset: 4:eb5a0daa2192 | |
554 | tag: tip | |
555 | parent: 0:ea207398892e | |
556 | user: test | |
557 | date: Thu Jan 01 00:00:00 1970 +0000 | |
558 | summary: C0 | |
559 | | |
560 | x changeset: 3:b7ea6d14e664 | |
561 | | parent: 1:471f378eab4c | |
562 | | user: test | |
563 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
564 | | summary: B1 | |
565 | | | |
566 | | x changeset: 2:0dec01379d3b | |
567 | |/ user: test | |
568 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
569 | | summary: B0 | |
570 | | | |
571 | x changeset: 1:471f378eab4c | |
572 |/ user: test | |
573 | date: Thu Jan 01 00:00:00 1970 +0000 | |
574 | summary: A0 | |
575 | | |
576 o changeset: 0:ea207398892e | |
577 user: test | |
578 date: Thu Jan 01 00:00:00 1970 +0000 | |
579 summary: ROOT | |
580 | |
581 Check templates | |
582 --------------- | |
583 | |
584 $ hg up 'desc(A0)' --hidden | |
585 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
586 working directory parent is obsolete! (471f378eab4c) | |
587 (use 'hg evolve' to update to its successor: eb5a0daa2192) | |
588 $ hg tlog | |
589 o eb5a0daa2192 | |
590 | Precursors: 471f378eab4c | |
591 | semi-colon: 471f378eab4c | |
592 | @ 471f378eab4c | |
593 |/ Successors: [eb5a0daa2192] | |
594 | semi-colon: [eb5a0daa2192] | |
595 | Fate: superseed as eb5a0daa2192 | |
596 o ea207398892e | |
597 | |
598 $ hg up 'desc(B0)' --hidden | |
599 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
600 working directory parent is obsolete! (0dec01379d3b) | |
601 (use 'hg evolve' to update to its successor: eb5a0daa2192) | |
602 $ hg tlog | |
603 o eb5a0daa2192 | |
604 | Precursors: 0dec01379d3b 471f378eab4c | |
605 | semi-colon: 0dec01379d3b; 471f378eab4c | |
606 | @ 0dec01379d3b | |
607 | | Successors: [eb5a0daa2192] | |
608 | | semi-colon: [eb5a0daa2192] | |
609 | | Fate: superseed as eb5a0daa2192 | |
610 | x 471f378eab4c | |
611 |/ Successors: [eb5a0daa2192] | |
612 | semi-colon: [eb5a0daa2192] | |
613 | Fate: superseed as eb5a0daa2192 | |
614 o ea207398892e | |
615 | |
616 $ hg up 'desc(B1)' --hidden | |
617 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
618 working directory parent is obsolete! (b7ea6d14e664) | |
619 (use 'hg evolve' to update to its successor: eb5a0daa2192) | |
620 $ hg tlog | |
621 o eb5a0daa2192 | |
622 | Precursors: 471f378eab4c b7ea6d14e664 | |
623 | semi-colon: 471f378eab4c; b7ea6d14e664 | |
624 | @ b7ea6d14e664 | |
625 | | Successors: [eb5a0daa2192] | |
626 | | semi-colon: [eb5a0daa2192] | |
627 | | Fate: superseed as eb5a0daa2192 | |
628 | x 471f378eab4c | |
629 |/ Successors: [eb5a0daa2192] | |
630 | semi-colon: [eb5a0daa2192] | |
631 | Fate: superseed as eb5a0daa2192 | |
632 o ea207398892e | |
633 | |
634 $ hg up 'desc(C0)' | |
635 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
636 $ hg tlog | |
637 @ eb5a0daa2192 | |
638 | | |
639 o ea207398892e | |
640 | |
641 $ hg tlog --hidden | |
642 @ eb5a0daa2192 | |
643 | Precursors: 471f378eab4c b7ea6d14e664 | |
644 | semi-colon: 471f378eab4c; b7ea6d14e664 | |
645 | x b7ea6d14e664 | |
646 | | Precursors: 0dec01379d3b | |
647 | | semi-colon: 0dec01379d3b | |
648 | | Successors: [eb5a0daa2192] | |
649 | | semi-colon: [eb5a0daa2192] | |
650 | | Fate: superseed as eb5a0daa2192 | |
651 | | x 0dec01379d3b | |
652 | |/ Successors: [b7ea6d14e664] | |
653 | | semi-colon: [b7ea6d14e664] | |
654 | | Fate: superseed as b7ea6d14e664 | |
655 | x 471f378eab4c | |
656 |/ Successors: [eb5a0daa2192] | |
657 | semi-colon: [eb5a0daa2192] | |
658 | Fate: superseed as eb5a0daa2192 | |
659 o ea207398892e | |
660 | |
661 | |
662 Test template with pushed and pulled obs markers | |
663 ============================================== | |
664 | |
665 Test setup | |
666 ---------- | |
667 | |
668 $ hg init $TESTTMP/templates-local-remote-markers-1 | |
669 $ cd $TESTTMP/templates-local-remote-markers-1 | |
670 $ mkcommit ROOT | |
671 $ mkcommit A0 | |
672 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2 | |
673 updating to branch default | |
674 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
675 $ cd $TESTTMP/templates-local-remote-markers-2 | |
676 $ hg log --hidden -G | |
677 @ changeset: 1:471f378eab4c | |
678 | tag: tip | |
679 | user: test | |
680 | date: Thu Jan 01 00:00:00 1970 +0000 | |
681 | summary: A0 | |
682 | | |
683 o changeset: 0:ea207398892e | |
684 user: test | |
685 date: Thu Jan 01 00:00:00 1970 +0000 | |
686 summary: ROOT | |
687 | |
688 $ cd $TESTTMP/templates-local-remote-markers-1 | |
689 $ hg amend -m "A1" | |
690 $ hg amend -m "A2" | |
691 $ hg log --hidden -G | |
692 @ changeset: 3:7a230b46bf61 | |
693 | tag: tip | |
694 | parent: 0:ea207398892e | |
695 | user: test | |
696 | date: Thu Jan 01 00:00:00 1970 +0000 | |
697 | summary: A2 | |
698 | | |
699 | x changeset: 2:fdf9bde5129a | |
700 |/ parent: 0:ea207398892e | |
701 | user: test | |
702 | date: Thu Jan 01 00:00:00 1970 +0000 | |
703 | summary: A1 | |
704 | | |
705 | x changeset: 1:471f378eab4c | |
706 |/ user: test | |
707 | date: Thu Jan 01 00:00:00 1970 +0000 | |
708 | summary: A0 | |
709 | | |
710 o changeset: 0:ea207398892e | |
711 user: test | |
712 date: Thu Jan 01 00:00:00 1970 +0000 | |
713 summary: ROOT | |
714 | |
715 $ cd $TESTTMP/templates-local-remote-markers-2 | |
716 $ hg pull | |
717 pulling from $TESTTMP/templates-local-remote-markers-1 | |
718 searching for changes | |
719 adding changesets | |
720 adding manifests | |
721 adding file changes | |
722 added 1 changesets with 0 changes to 1 files (+1 heads) | |
723 2 new obsolescence markers | |
724 (run 'hg heads' to see heads, 'hg merge' to merge) | |
725 working directory parent is obsolete! (471f378eab4c) | |
726 (use 'hg evolve' to update to its successor: 7a230b46bf61) | |
727 $ hg log --hidden -G | |
728 o changeset: 2:7a230b46bf61 | |
729 | tag: tip | |
730 | parent: 0:ea207398892e | |
731 | user: test | |
732 | date: Thu Jan 01 00:00:00 1970 +0000 | |
733 | summary: A2 | |
734 | | |
735 | @ changeset: 1:471f378eab4c | |
736 |/ user: test | |
737 | date: Thu Jan 01 00:00:00 1970 +0000 | |
738 | summary: A0 | |
739 | | |
740 o changeset: 0:ea207398892e | |
741 user: test | |
742 date: Thu Jan 01 00:00:00 1970 +0000 | |
743 summary: ROOT | |
744 | |
745 | |
746 Check templates | |
747 --------------- | |
748 | |
749 $ hg tlog | |
750 o 7a230b46bf61 | |
751 | Precursors: 471f378eab4c | |
752 | semi-colon: 471f378eab4c | |
753 | @ 471f378eab4c | |
754 |/ Successors: [7a230b46bf61] | |
755 | semi-colon: [7a230b46bf61] | |
756 | Fate: superseed as 7a230b46bf61 | |
757 o ea207398892e | |
758 | |
759 $ hg up 'desc(A2)' | |
760 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
761 $ hg tlog | |
762 @ 7a230b46bf61 | |
763 | | |
764 o ea207398892e | |
765 | |
766 $ hg tlog --hidden | |
767 @ 7a230b46bf61 | |
768 | Precursors: 471f378eab4c | |
769 | semi-colon: 471f378eab4c | |
770 | x 471f378eab4c | |
771 |/ Successors: [7a230b46bf61] | |
772 | semi-colon: [7a230b46bf61] | |
773 | Fate: superseed as 7a230b46bf61 | |
774 o ea207398892e | |
775 |