85 | @ 471f378eab4c |
85 | @ 471f378eab4c |
86 |/ Successors: [d004c8f274b9] |
86 |/ Successors: [d004c8f274b9] |
87 | semi-colon: [d004c8f274b9] |
87 | semi-colon: [d004c8f274b9] |
88 o ea207398892e |
88 o ea207398892e |
89 |
89 |
|
90 $ hg up 'desc(A1)' --hidden |
|
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
92 working directory parent is obsolete! (a468dc9b3633) |
|
93 (use 'hg evolve' to update to its successor: d004c8f274b9) |
90 |
94 |
91 Precursors template should show current revision as it is the working copy |
95 Precursors template should show current revision as it is the working copy |
92 $ hg tlog |
96 $ hg tlog |
93 o d004c8f274b9 |
97 o d004c8f274b9 |
94 | Precursors: 471f378eab4c |
98 | Precursors: a468dc9b3633 |
95 | semi-colon: 471f378eab4c |
99 | semi-colon: a468dc9b3633 |
96 | @ 471f378eab4c |
100 | @ a468dc9b3633 |
97 |/ Successors: [d004c8f274b9] |
101 |/ Successors: [d004c8f274b9] |
98 | semi-colon: [d004c8f274b9] |
102 | semi-colon: [d004c8f274b9] |
99 o ea207398892e |
103 o ea207398892e |
100 |
104 |
101 Precursors template should show the precursor as we force its display with |
105 Precursors template should show the precursor as we force its display with |
102 --hidden |
106 --hidden |
103 $ hg tlog --hidden |
107 $ hg tlog --hidden |
104 o d004c8f274b9 |
108 o d004c8f274b9 |
|
109 | Precursors: a468dc9b3633 |
|
110 | semi-colon: a468dc9b3633 |
|
111 | @ a468dc9b3633 |
|
112 |/ Precursors: 471f378eab4c |
|
113 | semi-colon: 471f378eab4c |
|
114 | Successors: [d004c8f274b9] |
|
115 | semi-colon: [d004c8f274b9] |
|
116 | x f137d23bb3e1 |
|
117 | | |
|
118 | x 471f378eab4c |
|
119 |/ Successors: [a468dc9b3633] |
|
120 | semi-colon: [a468dc9b3633] |
|
121 o ea207398892e |
|
122 |
|
123 |
|
124 $ hg up 'desc(A2)' |
|
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 $ hg tlog |
|
127 @ d004c8f274b9 |
|
128 | |
|
129 o ea207398892e |
|
130 |
|
131 $ hg tlog --hidden |
|
132 @ d004c8f274b9 |
105 | Precursors: a468dc9b3633 |
133 | Precursors: a468dc9b3633 |
106 | semi-colon: a468dc9b3633 |
134 | semi-colon: a468dc9b3633 |
107 | x a468dc9b3633 |
135 | x a468dc9b3633 |
108 |/ Precursors: 471f378eab4c |
136 |/ Precursors: 471f378eab4c |
109 | semi-colon: 471f378eab4c |
137 | semi-colon: 471f378eab4c |
110 | Successors: [d004c8f274b9] |
138 | Successors: [d004c8f274b9] |
111 | semi-colon: [d004c8f274b9] |
139 | semi-colon: [d004c8f274b9] |
112 | x f137d23bb3e1 |
140 | x f137d23bb3e1 |
113 | | |
141 | | |
114 | @ 471f378eab4c |
142 | x 471f378eab4c |
115 |/ Successors: [a468dc9b3633] |
|
116 | semi-colon: [a468dc9b3633] |
|
117 o ea207398892e |
|
118 |
|
119 $ hg tlog |
|
120 o d004c8f274b9 |
|
121 | Precursors: 471f378eab4c |
|
122 | semi-colon: 471f378eab4c |
|
123 | @ 471f378eab4c |
|
124 |/ Successors: [d004c8f274b9] |
|
125 | semi-colon: [d004c8f274b9] |
|
126 o ea207398892e |
|
127 |
|
128 $ hg tlog --hidden |
|
129 o d004c8f274b9 |
|
130 | Precursors: a468dc9b3633 |
|
131 | semi-colon: a468dc9b3633 |
|
132 | x a468dc9b3633 |
|
133 |/ Precursors: 471f378eab4c |
|
134 | semi-colon: 471f378eab4c |
|
135 | Successors: [d004c8f274b9] |
|
136 | semi-colon: [d004c8f274b9] |
|
137 | x f137d23bb3e1 |
|
138 | | |
|
139 | @ 471f378eab4c |
|
140 |/ Successors: [a468dc9b3633] |
143 |/ Successors: [a468dc9b3633] |
141 | semi-colon: [a468dc9b3633] |
144 | semi-colon: [a468dc9b3633] |
142 o ea207398892e |
145 o ea207398892e |
143 |
146 |
144 |
147 |
342 | @ 471f378eab4c |
345 | @ 471f378eab4c |
343 |/ Successors: [eb5a0daa2192] |
346 |/ Successors: [eb5a0daa2192] |
344 | semi-colon: [eb5a0daa2192] |
347 | semi-colon: [eb5a0daa2192] |
345 o ea207398892e |
348 o ea207398892e |
346 |
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 |
347 Precursors template should show both precursors as they should be both |
355 Precursors template should show both precursors as they should be both |
348 displayed |
356 displayed |
349 $ hg tlog |
357 $ hg tlog |
350 o eb5a0daa2192 |
358 o eb5a0daa2192 |
351 | Precursors: 471f378eab4c |
359 | Precursors: 0dec01379d3b 471f378eab4c |
352 | semi-colon: 471f378eab4c |
360 | semi-colon: 0dec01379d3b; 471f378eab4c |
353 | @ 471f378eab4c |
361 | @ 0dec01379d3b |
|
362 | | Successors: [eb5a0daa2192] |
|
363 | | semi-colon: [eb5a0daa2192] |
|
364 | x 471f378eab4c |
354 |/ Successors: [eb5a0daa2192] |
365 |/ Successors: [eb5a0daa2192] |
355 | semi-colon: [eb5a0daa2192] |
366 | semi-colon: [eb5a0daa2192] |
356 o ea207398892e |
367 o ea207398892e |
357 |
368 |
358 $ hg up 'desc(C0)' |
369 $ hg up 'desc(C0)' |
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
370 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
360 |
371 |
361 Precursors template should not show precursors as it's not displayed in the |
372 Precursors template should not show precursors as it's not displayed in the |
362 log |
373 log |
363 $ hg tlog |
374 $ hg tlog |
364 @ eb5a0daa2192 |
375 @ eb5a0daa2192 |
471 | |
482 | |
472 | @ fdf9bde5129a |
483 | @ fdf9bde5129a |
473 |/ |
484 |/ |
474 o ea207398892e |
485 o ea207398892e |
475 |
486 |
|
487 |
|
488 Precursors template should a precursor as we force its display with --hidden |
|
489 $ hg tlog --hidden |
|
490 o 019fadeab383 |
|
491 | Precursors: 65b757b745b9 |
|
492 | semi-colon: 65b757b745b9 |
|
493 | x 65b757b745b9 |
|
494 |/ Precursors: 471f378eab4c |
|
495 | semi-colon: 471f378eab4c |
|
496 | Successors: [019fadeab383] |
|
497 | semi-colon: [019fadeab383] |
|
498 | @ fdf9bde5129a |
|
499 |/ Precursors: 471f378eab4c |
|
500 | semi-colon: 471f378eab4c |
|
501 | x 471f378eab4c |
|
502 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
|
503 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
|
504 o ea207398892e |
|
505 |
|
506 |
476 Test templates with amended + folded commit |
507 Test templates with amended + folded commit |
477 =========================================== |
508 =========================================== |
478 |
509 |
479 Test setup |
510 Test setup |
480 ---------- |
511 ---------- |
554 | @ 471f378eab4c |
585 | @ 471f378eab4c |
555 |/ Successors: [eb5a0daa2192] |
586 |/ Successors: [eb5a0daa2192] |
556 | semi-colon: [eb5a0daa2192] |
587 | semi-colon: [eb5a0daa2192] |
557 o ea207398892e |
588 o ea207398892e |
558 |
589 |
|
590 $ hg up 'desc(B0)' --hidden |
|
591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
592 working directory parent is obsolete! (0dec01379d3b) |
|
593 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
594 $ hg tlog |
|
595 o eb5a0daa2192 |
|
596 | Precursors: 0dec01379d3b 471f378eab4c |
|
597 | semi-colon: 0dec01379d3b; 471f378eab4c |
|
598 | @ 0dec01379d3b |
|
599 | | Successors: [eb5a0daa2192] |
|
600 | | semi-colon: [eb5a0daa2192] |
|
601 | x 471f378eab4c |
|
602 |/ Successors: [eb5a0daa2192] |
|
603 | semi-colon: [eb5a0daa2192] |
|
604 o ea207398892e |
|
605 |
|
606 |
|
607 $ hg up 'desc(B1)' --hidden |
|
608 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
609 working directory parent is obsolete! (b7ea6d14e664) |
|
610 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
611 $ hg tlog |
|
612 o eb5a0daa2192 |
|
613 | Precursors: 471f378eab4c b7ea6d14e664 |
|
614 | semi-colon: 471f378eab4c; b7ea6d14e664 |
|
615 | @ b7ea6d14e664 |
|
616 | | Successors: [eb5a0daa2192] |
|
617 | | semi-colon: [eb5a0daa2192] |
|
618 | x 471f378eab4c |
|
619 |/ Successors: [eb5a0daa2192] |
|
620 | semi-colon: [eb5a0daa2192] |
|
621 o ea207398892e |
|
622 |
|
623 |
|
624 $ hg up 'desc(C0)' |
|
625 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
626 $ hg tlog |
|
627 @ eb5a0daa2192 |
|
628 | |
|
629 o ea207398892e |
|
630 |
559 $ hg tlog --hidden |
631 $ hg tlog --hidden |
560 o eb5a0daa2192 |
632 @ eb5a0daa2192 |
561 | Precursors: 471f378eab4c b7ea6d14e664 |
633 | Precursors: 471f378eab4c b7ea6d14e664 |
562 | semi-colon: 471f378eab4c; b7ea6d14e664 |
634 | semi-colon: 471f378eab4c; b7ea6d14e664 |
563 | x b7ea6d14e664 |
635 | x b7ea6d14e664 |
564 | | Precursors: 0dec01379d3b |
636 | | Precursors: 0dec01379d3b |
565 | | semi-colon: 0dec01379d3b |
637 | | semi-colon: 0dec01379d3b |
566 | | Successors: [eb5a0daa2192] |
638 | | Successors: [eb5a0daa2192] |
567 | | semi-colon: [eb5a0daa2192] |
639 | | semi-colon: [eb5a0daa2192] |
568 | | x 0dec01379d3b |
640 | | x 0dec01379d3b |
569 | |/ Successors: [b7ea6d14e664] |
641 | |/ Successors: [b7ea6d14e664] |
570 | | semi-colon: [b7ea6d14e664] |
642 | | semi-colon: [b7ea6d14e664] |
571 | @ 471f378eab4c |
643 | x 471f378eab4c |
572 |/ Successors: [eb5a0daa2192] |
644 |/ Successors: [eb5a0daa2192] |
573 | semi-colon: [eb5a0daa2192] |
645 | semi-colon: [eb5a0daa2192] |
574 o ea207398892e |
646 o ea207398892e |
575 |
647 |
576 Test template with pushed and pulled obs markers |
648 Test template with pushed and pulled obs markers |