17 > tlog = log -G -T '{node|short}\ |
17 > tlog = log -G -T '{node|short}\ |
18 > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
18 > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
19 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
19 > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\ |
20 > {if(successors, "\n Successors: {successors}")}\ |
20 > {if(successors, "\n Successors: {successors}")}\ |
21 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
21 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
22 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
22 > {if(obsfate, "{obsfate % "\n Fate: {fate}"}")}\ |
23 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
23 > {if(obsorigin, "{obsorigin % "\n Origin: {origin}"}")}\n\n' |
|
24 > fateoriginlog = log -G -T '{node|short}\ |
|
25 > {if(obsfate, "\n Obsfate: {join(obsfate, "; ")}")}\ |
|
26 > {if(obsorigin, "\n Obsorigin: {join(obsorigin, "; ")}")}\n\n' |
24 > EOF |
27 > EOF |
25 |
28 |
26 Test templates on amended commit |
29 Test templates on amended commit |
27 ================================ |
30 ================================ |
28 |
31 |
72 (use 'hg evolve' to update to its successor: d004c8f274b9) |
75 (use 'hg evolve' to update to its successor: d004c8f274b9) |
73 |
76 |
74 Predecessors template should show current revision as it is the working copy |
77 Predecessors template should show current revision as it is the working copy |
75 $ hg olog tip |
78 $ hg olog tip |
76 o d004c8f274b9 (3) A2 |
79 o d004c8f274b9 (3) A2 |
|
80 | reworded(description) from a468dc9b3633 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000) |
77 | |
81 | |
78 x a468dc9b3633 (2) A1 |
82 x a468dc9b3633 (2) A1 |
79 | reworded(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000) |
83 | rewritten(description, content) from 471f378eab4c using amend by test (Fri Feb 13 23:31:30 2009 +0000) |
80 | |
84 | |
81 @ 471f378eab4c (1) A0 |
85 @ 471f378eab4c (1) A0 |
82 rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000) |
|
83 |
86 |
84 $ hg tlog |
87 $ hg tlog |
85 o d004c8f274b9 |
88 o d004c8f274b9 |
86 | Predecessors: 1:471f378eab4c |
89 | Predecessors: 1:471f378eab4c |
87 | semi-colon: 1:471f378eab4c |
90 | semi-colon: 1:471f378eab4c |
|
91 | Origin: rewritten using amend from 1:471f378eab4c by test, test2 |
|
92 | |
88 | @ 471f378eab4c |
93 | @ 471f378eab4c |
89 |/ Successors: 3:d004c8f274b9 |
94 |/ Successors: 3:d004c8f274b9 |
90 | semi-colon: 3:d004c8f274b9 |
95 | semi-colon: 3:d004c8f274b9 |
91 | Fate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
96 | Fate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
92 | |
97 | |
180 --hidden |
190 --hidden |
181 $ hg tlog --hidden |
191 $ hg tlog --hidden |
182 o d004c8f274b9 |
192 o d004c8f274b9 |
183 | Predecessors: 2:a468dc9b3633 |
193 | Predecessors: 2:a468dc9b3633 |
184 | semi-colon: 2:a468dc9b3633 |
194 | semi-colon: 2:a468dc9b3633 |
|
195 | Origin: reworded using amend from 2:a468dc9b3633 by test2 |
|
196 | |
185 | @ a468dc9b3633 |
197 | @ a468dc9b3633 |
186 |/ Predecessors: 1:471f378eab4c |
198 |/ Predecessors: 1:471f378eab4c |
187 | semi-colon: 1:471f378eab4c |
199 | semi-colon: 1:471f378eab4c |
188 | Successors: 3:d004c8f274b9 |
200 | Successors: 3:d004c8f274b9 |
189 | semi-colon: 3:d004c8f274b9 |
201 | semi-colon: 3:d004c8f274b9 |
190 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
202 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
|
203 | Origin: rewritten using amend from 1:471f378eab4c |
191 | |
204 | |
192 | x 471f378eab4c |
205 | x 471f378eab4c |
193 |/ Successors: 2:a468dc9b3633 |
206 |/ Successors: 2:a468dc9b3633 |
194 | semi-colon: 2:a468dc9b3633 |
207 | semi-colon: 2:a468dc9b3633 |
195 | Fate: rewritten using amend as 2:a468dc9b3633 |
208 | Fate: rewritten using amend as 2:a468dc9b3633 |
196 | |
209 | |
197 o ea207398892e |
210 o ea207398892e |
198 |
211 |
199 $ hg fatelog -v |
212 $ hg fateoriginlog -v |
200 o d004c8f274b9 |
213 o d004c8f274b9 |
|
214 | Obsorigin: reworded using amend from 2:a468dc9b3633 by test2 (at 2001-04-19 04:25 +0000) |
201 | |
215 | |
202 | @ a468dc9b3633 |
216 | @ a468dc9b3633 |
203 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
217 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
204 | |
218 | |
205 o ea207398892e |
219 o ea207398892e |
213 |
227 |
214 $ hg tlog --hidden |
228 $ hg tlog --hidden |
215 @ d004c8f274b9 |
229 @ d004c8f274b9 |
216 | Predecessors: 2:a468dc9b3633 |
230 | Predecessors: 2:a468dc9b3633 |
217 | semi-colon: 2:a468dc9b3633 |
231 | semi-colon: 2:a468dc9b3633 |
|
232 | Origin: reworded using amend from 2:a468dc9b3633 by test2 |
|
233 | |
218 | x a468dc9b3633 |
234 | x a468dc9b3633 |
219 |/ Predecessors: 1:471f378eab4c |
235 |/ Predecessors: 1:471f378eab4c |
220 | semi-colon: 1:471f378eab4c |
236 | semi-colon: 1:471f378eab4c |
221 | Successors: 3:d004c8f274b9 |
237 | Successors: 3:d004c8f274b9 |
222 | semi-colon: 3:d004c8f274b9 |
238 | semi-colon: 3:d004c8f274b9 |
223 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
239 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
|
240 | Origin: rewritten using amend from 1:471f378eab4c |
224 | |
241 | |
225 | x 471f378eab4c |
242 | x 471f378eab4c |
226 |/ Successors: 2:a468dc9b3633 |
243 |/ Successors: 2:a468dc9b3633 |
227 | semi-colon: 2:a468dc9b3633 |
244 | semi-colon: 2:a468dc9b3633 |
228 | Fate: rewritten using amend as 2:a468dc9b3633 |
245 | Fate: rewritten using amend as 2:a468dc9b3633 |
229 | |
246 | |
230 o ea207398892e |
247 o ea207398892e |
231 |
248 |
232 $ hg fatelog -v |
249 $ hg fateoriginlog -v |
233 @ d004c8f274b9 |
250 @ d004c8f274b9 |
234 | |
251 | |
235 o ea207398892e |
252 o ea207398892e |
236 |
253 |
237 |
254 |
238 $ hg fatelog -v --hidden |
255 $ hg fateoriginlog -v --hidden |
239 @ d004c8f274b9 |
256 @ d004c8f274b9 |
|
257 | Obsorigin: reworded using amend from 2:a468dc9b3633 by test2 (at 2001-04-19 04:25 +0000) |
240 | |
258 | |
241 | x a468dc9b3633 |
259 | x a468dc9b3633 |
242 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
260 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
|
261 | Obsorigin: rewritten using amend from 1:471f378eab4c by test (at 2009-02-13 23:31 +0000) |
243 | |
262 | |
244 | x 471f378eab4c |
263 | x 471f378eab4c |
245 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
264 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
246 | |
265 | |
247 o ea207398892e |
266 o ea207398892e |
343 Predecessors template should show current revision as it is the working copy |
362 Predecessors template should show current revision as it is the working copy |
344 $ hg tlog |
363 $ hg tlog |
345 o f257fde29c7a |
364 o f257fde29c7a |
346 | Predecessors: 1:471597cad322 |
365 | Predecessors: 1:471597cad322 |
347 | semi-colon: 1:471597cad322 |
366 | semi-colon: 1:471597cad322 |
|
367 | Origin: split using split from 1:471597cad322 |
|
368 | |
348 o 337fec4d2edc |
369 o 337fec4d2edc |
349 | Predecessors: 1:471597cad322 |
370 | Predecessors: 1:471597cad322 |
350 | semi-colon: 1:471597cad322 |
371 | semi-colon: 1:471597cad322 |
|
372 | Origin: split using split from 1:471597cad322 |
|
373 | |
351 | @ 471597cad322 |
374 | @ 471597cad322 |
352 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
375 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
353 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
376 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
354 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
377 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
355 | |
378 | |
356 o ea207398892e |
379 o ea207398892e |
357 |
380 |
358 $ hg fatelog |
381 $ hg fateoriginlog |
359 o f257fde29c7a |
382 o f257fde29c7a |
|
383 | Obsorigin: split using split from 1:471597cad322 |
360 | |
384 | |
361 o 337fec4d2edc |
385 o 337fec4d2edc |
|
386 | Obsorigin: split using split from 1:471597cad322 |
362 | |
387 | |
363 | @ 471597cad322 |
388 | @ 471597cad322 |
364 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
389 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
365 | |
390 | |
366 o ea207398892e |
391 o ea207398892e |
382 --hidden |
407 --hidden |
383 $ hg tlog --hidden |
408 $ hg tlog --hidden |
384 @ f257fde29c7a |
409 @ f257fde29c7a |
385 | Predecessors: 1:471597cad322 |
410 | Predecessors: 1:471597cad322 |
386 | semi-colon: 1:471597cad322 |
411 | semi-colon: 1:471597cad322 |
|
412 | Origin: split using split from 1:471597cad322 |
|
413 | |
387 o 337fec4d2edc |
414 o 337fec4d2edc |
388 | Predecessors: 1:471597cad322 |
415 | Predecessors: 1:471597cad322 |
389 | semi-colon: 1:471597cad322 |
416 | semi-colon: 1:471597cad322 |
|
417 | Origin: split using split from 1:471597cad322 |
|
418 | |
390 | x 471597cad322 |
419 | x 471597cad322 |
391 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
420 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
392 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
421 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
393 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
422 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
394 | |
423 | |
395 o ea207398892e |
424 o ea207398892e |
396 |
425 |
397 $ hg fatelog --hidden |
426 $ hg fateoriginlog --hidden |
398 @ f257fde29c7a |
427 @ f257fde29c7a |
|
428 | Obsorigin: split using split from 1:471597cad322 |
399 | |
429 | |
400 o 337fec4d2edc |
430 o 337fec4d2edc |
|
431 | Obsorigin: split using split from 1:471597cad322 |
401 | |
432 | |
402 | x 471597cad322 |
433 | x 471597cad322 |
403 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
434 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
404 | |
435 | |
405 o ea207398892e |
436 o ea207398892e |
649 Predecessors template should show current revision as it is the working copy |
689 Predecessors template should show current revision as it is the working copy |
650 $ hg tlog |
690 $ hg tlog |
651 * 019fadeab383 |
691 * 019fadeab383 |
652 | Predecessors: 1:471f378eab4c |
692 | Predecessors: 1:471f378eab4c |
653 | semi-colon: 1:471f378eab4c |
693 | semi-colon: 1:471f378eab4c |
|
694 | Origin: reworded using amend from 1:471f378eab4c |
|
695 | |
654 | * fdf9bde5129a |
696 | * fdf9bde5129a |
655 |/ Predecessors: 1:471f378eab4c |
697 |/ Predecessors: 1:471f378eab4c |
656 | semi-colon: 1:471f378eab4c |
698 | semi-colon: 1:471f378eab4c |
|
699 | Origin: reworded using amend from 1:471f378eab4c |
|
700 | |
657 | @ 471f378eab4c |
701 | @ 471f378eab4c |
658 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
702 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
659 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
703 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
660 | Fate: reworded using amend as 2:fdf9bde5129a |
704 | Fate: reworded using amend as 2:fdf9bde5129a |
661 | Fate: reworded using amend as 4:019fadeab383 |
705 | Fate: reworded using amend as 4:019fadeab383 |
662 | |
706 | |
663 o ea207398892e |
707 o ea207398892e |
664 |
708 |
665 $ hg fatelog |
709 $ hg fateoriginlog |
666 * 019fadeab383 |
710 * 019fadeab383 |
|
711 | Obsorigin: reworded using amend from 1:471f378eab4c |
667 | |
712 | |
668 | * fdf9bde5129a |
713 | * fdf9bde5129a |
669 |/ |
714 |/ Obsorigin: reworded using amend from 1:471f378eab4c |
|
715 | |
670 | @ 471f378eab4c |
716 | @ 471f378eab4c |
671 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 |
717 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 |
672 | |
718 | |
673 o ea207398892e |
719 o ea207398892e |
674 |
720 |
695 Predecessors template should a precursor as we force its display with --hidden |
741 Predecessors template should a precursor as we force its display with --hidden |
696 $ hg tlog --hidden |
742 $ hg tlog --hidden |
697 * 019fadeab383 |
743 * 019fadeab383 |
698 | Predecessors: 3:65b757b745b9 |
744 | Predecessors: 3:65b757b745b9 |
699 | semi-colon: 3:65b757b745b9 |
745 | semi-colon: 3:65b757b745b9 |
|
746 | Origin: reworded using amend from 3:65b757b745b9 |
|
747 | |
700 | x 65b757b745b9 |
748 | x 65b757b745b9 |
701 |/ Predecessors: 1:471f378eab4c |
749 |/ Predecessors: 1:471f378eab4c |
702 | semi-colon: 1:471f378eab4c |
750 | semi-colon: 1:471f378eab4c |
703 | Successors: 4:019fadeab383 |
751 | Successors: 4:019fadeab383 |
704 | semi-colon: 4:019fadeab383 |
752 | semi-colon: 4:019fadeab383 |
705 | Fate: reworded using amend as 4:019fadeab383 |
753 | Fate: reworded using amend as 4:019fadeab383 |
|
754 | Origin: reworded using amend from 1:471f378eab4c |
706 | |
755 | |
707 | @ fdf9bde5129a |
756 | @ fdf9bde5129a |
708 |/ Predecessors: 1:471f378eab4c |
757 |/ Predecessors: 1:471f378eab4c |
709 | semi-colon: 1:471f378eab4c |
758 | semi-colon: 1:471f378eab4c |
|
759 | Origin: reworded using amend from 1:471f378eab4c |
|
760 | |
710 | x 471f378eab4c |
761 | x 471f378eab4c |
711 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
762 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
712 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
763 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
713 | Fate: reworded using amend as 2:fdf9bde5129a |
764 | Fate: reworded using amend as 2:fdf9bde5129a |
714 | Fate: reworded using amend as 3:65b757b745b9 |
765 | Fate: reworded using amend as 3:65b757b745b9 |
715 | |
766 | |
716 o ea207398892e |
767 o ea207398892e |
717 |
768 |
718 $ hg fatelog --hidden |
769 $ hg fateoriginlog --hidden |
719 * 019fadeab383 |
770 * 019fadeab383 |
|
771 | Obsorigin: reworded using amend from 3:65b757b745b9 |
720 | |
772 | |
721 | x 65b757b745b9 |
773 | x 65b757b745b9 |
722 |/ Obsfate: reworded using amend as 4:019fadeab383 |
774 |/ Obsfate: reworded using amend as 4:019fadeab383 |
|
775 | Obsorigin: reworded using amend from 1:471f378eab4c |
723 | |
776 | |
724 | @ fdf9bde5129a |
777 | @ fdf9bde5129a |
725 |/ |
778 |/ Obsorigin: reworded using amend from 1:471f378eab4c |
|
779 | |
726 | x 471f378eab4c |
780 | x 471f378eab4c |
727 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
781 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
728 | |
782 | |
729 o ea207398892e |
783 o ea207398892e |
730 |
784 |
905 |
968 |
906 $ hg tlog --hidden |
969 $ hg tlog --hidden |
907 @ eb5a0daa2192 |
970 @ eb5a0daa2192 |
908 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
971 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
909 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
972 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
973 | Origin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664 |
|
974 | |
910 | x b7ea6d14e664 |
975 | x b7ea6d14e664 |
911 | | Predecessors: 2:0dec01379d3b |
976 | | Predecessors: 2:0dec01379d3b |
912 | | semi-colon: 2:0dec01379d3b |
977 | | semi-colon: 2:0dec01379d3b |
913 | | Successors: 4:eb5a0daa2192 |
978 | | Successors: 4:eb5a0daa2192 |
914 | | semi-colon: 4:eb5a0daa2192 |
979 | | semi-colon: 4:eb5a0daa2192 |
915 | | Fate: folded using fold as 4:eb5a0daa2192 |
980 | | Fate: folded using fold as 4:eb5a0daa2192 |
|
981 | | Origin: reworded using amend from 2:0dec01379d3b |
916 | | |
982 | | |
917 | | x 0dec01379d3b |
983 | | x 0dec01379d3b |
918 | |/ Successors: 3:b7ea6d14e664 |
984 | |/ Successors: 3:b7ea6d14e664 |
919 | | semi-colon: 3:b7ea6d14e664 |
985 | | semi-colon: 3:b7ea6d14e664 |
920 | | Fate: reworded using amend as 3:b7ea6d14e664 |
986 | | Fate: reworded using amend as 3:b7ea6d14e664 |
1129 (use 'hg evolve' to update to its parent successor) |
1203 (use 'hg evolve' to update to its parent successor) |
1130 $ hg tlog |
1204 $ hg tlog |
1131 o f897c6137566 |
1205 o f897c6137566 |
1132 | Predecessors: 2:0dec01379d3b |
1206 | Predecessors: 2:0dec01379d3b |
1133 | semi-colon: 2:0dec01379d3b |
1207 | semi-colon: 2:0dec01379d3b |
|
1208 | Origin: rewritten from 2:0dec01379d3b |
|
1209 | |
1134 | @ 0dec01379d3b |
1210 | @ 0dec01379d3b |
1135 | | Predecessors: 1:471f378eab4c |
1211 | | Predecessors: 1:471f378eab4c |
1136 | | semi-colon: 1:471f378eab4c |
1212 | | semi-colon: 1:471f378eab4c |
1137 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1213 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1138 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1214 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1139 | | Fate: rewritten as 3:f897c6137566 |
1215 | | Fate: rewritten as 3:f897c6137566 |
1140 | | Fate: rewritten as 1:471f378eab4c |
1216 | | Fate: rewritten as 1:471f378eab4c |
|
1217 | | Origin: rewritten from 1:471f378eab4c |
1141 | | |
1218 | | |
1142 | x 471f378eab4c |
1219 | x 471f378eab4c |
1143 |/ Predecessors: 2:0dec01379d3b |
1220 |/ Predecessors: 2:0dec01379d3b |
1144 | semi-colon: 2:0dec01379d3b |
1221 | semi-colon: 2:0dec01379d3b |
1145 | Successors: 2:0dec01379d3b |
1222 | Successors: 2:0dec01379d3b |
1146 | semi-colon: 2:0dec01379d3b |
1223 | semi-colon: 2:0dec01379d3b |
1147 | Fate: rewritten as 2:0dec01379d3b |
1224 | Fate: rewritten as 2:0dec01379d3b |
1148 | |
1225 | Origin: rewritten from 2:0dec01379d3b |
1149 o ea207398892e |
1226 | |
1150 |
1227 o ea207398892e |
1151 $ hg fatelog |
1228 |
|
1229 $ hg fateoriginlog |
1152 o f897c6137566 |
1230 o f897c6137566 |
|
1231 | Obsorigin: rewritten from 2:0dec01379d3b |
1153 | |
1232 | |
1154 | @ 0dec01379d3b |
1233 | @ 0dec01379d3b |
1155 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
1234 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
|
1235 | | Obsorigin: rewritten from 1:471f378eab4c |
1156 | | |
1236 | | |
1157 | x 471f378eab4c |
1237 | x 471f378eab4c |
1158 |/ Obsfate: rewritten as 2:0dec01379d3b |
1238 |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1239 | Obsorigin: rewritten from 2:0dec01379d3b |
1159 | |
1240 | |
1160 o ea207398892e |
1241 o ea207398892e |
1161 |
1242 |
1162 $ hg up -r "desc(A0)" --hidden |
1243 $ hg up -r "desc(A0)" --hidden |
1163 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1244 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1186 $ hg tlog |
1270 $ hg tlog |
1187 o f897c6137566 |
1271 o f897c6137566 |
1188 | |
1272 | |
1189 @ ea207398892e |
1273 @ ea207398892e |
1190 |
1274 |
1191 $ hg fatelog |
1275 $ hg fateoriginlog |
1192 o f897c6137566 |
1276 o f897c6137566 |
1193 | |
1277 | |
1194 @ ea207398892e |
1278 @ ea207398892e |
1195 |
1279 |
1196 $ hg tlog --hidden |
1280 $ hg tlog --hidden |
1197 o f897c6137566 |
1281 o f897c6137566 |
1198 | Predecessors: 2:0dec01379d3b |
1282 | Predecessors: 2:0dec01379d3b |
1199 | semi-colon: 2:0dec01379d3b |
1283 | semi-colon: 2:0dec01379d3b |
|
1284 | Origin: rewritten from 2:0dec01379d3b |
|
1285 | |
1200 | x 0dec01379d3b |
1286 | x 0dec01379d3b |
1201 | | Predecessors: 1:471f378eab4c |
1287 | | Predecessors: 1:471f378eab4c |
1202 | | semi-colon: 1:471f378eab4c |
1288 | | semi-colon: 1:471f378eab4c |
1203 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1289 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1204 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1290 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1205 | | Fate: rewritten as 3:f897c6137566 |
1291 | | Fate: rewritten as 3:f897c6137566 |
1206 | | Fate: rewritten as 1:471f378eab4c |
1292 | | Fate: rewritten as 1:471f378eab4c |
|
1293 | | Origin: rewritten from 1:471f378eab4c |
1207 | | |
1294 | | |
1208 | x 471f378eab4c |
1295 | x 471f378eab4c |
1209 |/ Predecessors: 2:0dec01379d3b |
1296 |/ Predecessors: 2:0dec01379d3b |
1210 | semi-colon: 2:0dec01379d3b |
1297 | semi-colon: 2:0dec01379d3b |
1211 | Successors: 2:0dec01379d3b |
1298 | Successors: 2:0dec01379d3b |
1212 | semi-colon: 2:0dec01379d3b |
1299 | semi-colon: 2:0dec01379d3b |
1213 | Fate: rewritten as 2:0dec01379d3b |
1300 | Fate: rewritten as 2:0dec01379d3b |
|
1301 | Origin: rewritten from 2:0dec01379d3b |
1214 | |
1302 | |
1215 @ ea207398892e |
1303 @ ea207398892e |
1216 |
1304 |
1217 Test template with split + divergence with cycles |
1305 Test template with split + divergence with cycles |
1218 ================================================= |
1306 ================================================= |
1418 |
1512 |
1419 $ hg tlog --hidden |
1513 $ hg tlog --hidden |
1420 @ 0b997eb7ceee |
1514 @ 0b997eb7ceee |
1421 | Predecessors: 6:4a004186e638 |
1515 | Predecessors: 6:4a004186e638 |
1422 | semi-colon: 6:4a004186e638 |
1516 | semi-colon: 6:4a004186e638 |
|
1517 | Origin: reworded using amend from 6:4a004186e638 |
|
1518 | |
1423 | * b18bc8331526 |
1519 | * b18bc8331526 |
1424 |/ Predecessors: 6:4a004186e638 |
1520 |/ Predecessors: 6:4a004186e638 |
1425 | semi-colon: 6:4a004186e638 |
1521 | semi-colon: 6:4a004186e638 |
|
1522 | Origin: reworded using amend from 6:4a004186e638 |
|
1523 | |
1426 | * ba2ed02b0c9a |
1524 | * ba2ed02b0c9a |
1427 | | Predecessors: 4:9bd10a0775e4 |
1525 | | Predecessors: 4:9bd10a0775e4 |
1428 | | semi-colon: 4:9bd10a0775e4 |
1526 | | semi-colon: 4:9bd10a0775e4 |
|
1527 | | Origin: split from 4:9bd10a0775e4 |
|
1528 | | |
1429 | x 4a004186e638 |
1529 | x 4a004186e638 |
1430 |/ Predecessors: 4:9bd10a0775e4 |
1530 |/ Predecessors: 4:9bd10a0775e4 |
1431 | semi-colon: 4:9bd10a0775e4 |
1531 | semi-colon: 4:9bd10a0775e4 |
1432 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1532 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1433 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1533 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1434 | Fate: reworded using amend as 8:b18bc8331526 |
1534 | Fate: reworded using amend as 8:b18bc8331526 |
1435 | Fate: reworded using amend as 9:0b997eb7ceee |
1535 | Fate: reworded using amend as 9:0b997eb7ceee |
|
1536 | Origin: split from 4:9bd10a0775e4 |
1436 | |
1537 | |
1437 * dd800401bd8c |
1538 * dd800401bd8c |
1438 | Predecessors: 4:9bd10a0775e4 |
1539 | Predecessors: 4:9bd10a0775e4 |
1439 | semi-colon: 4:9bd10a0775e4 |
1540 | semi-colon: 4:9bd10a0775e4 |
|
1541 | Origin: split from 4:9bd10a0775e4 |
|
1542 | |
1440 | x 9bd10a0775e4 |
1543 | x 9bd10a0775e4 |
1441 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1544 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1442 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1545 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1443 | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1546 | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1444 | |
1547 | |
1445 o f897c6137566 |
1548 o f897c6137566 |
1446 | Predecessors: 2:0dec01379d3b |
1549 | Predecessors: 2:0dec01379d3b |
1447 | semi-colon: 2:0dec01379d3b |
1550 | semi-colon: 2:0dec01379d3b |
|
1551 | Origin: rewritten from 2:0dec01379d3b |
|
1552 | |
1448 | x 0dec01379d3b |
1553 | x 0dec01379d3b |
1449 | | Predecessors: 1:471f378eab4c |
1554 | | Predecessors: 1:471f378eab4c |
1450 | | semi-colon: 1:471f378eab4c |
1555 | | semi-colon: 1:471f378eab4c |
1451 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1556 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1452 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1557 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1453 | | Fate: rewritten as 3:f897c6137566 |
1558 | | Fate: rewritten as 3:f897c6137566 |
1454 | | Fate: rewritten as 1:471f378eab4c |
1559 | | Fate: rewritten as 1:471f378eab4c |
|
1560 | | Origin: rewritten from 1:471f378eab4c |
1455 | | |
1561 | | |
1456 | x 471f378eab4c |
1562 | x 471f378eab4c |
1457 |/ Predecessors: 2:0dec01379d3b |
1563 |/ Predecessors: 2:0dec01379d3b |
1458 | semi-colon: 2:0dec01379d3b |
1564 | semi-colon: 2:0dec01379d3b |
1459 | Successors: 2:0dec01379d3b |
1565 | Successors: 2:0dec01379d3b |
1460 | semi-colon: 2:0dec01379d3b |
1566 | semi-colon: 2:0dec01379d3b |
1461 | Fate: rewritten as 2:0dec01379d3b |
1567 | Fate: rewritten as 2:0dec01379d3b |
1462 | |
1568 | Origin: rewritten from 2:0dec01379d3b |
1463 o ea207398892e |
1569 | |
1464 |
1570 o ea207398892e |
1465 $ hg fatelog --hidden |
1571 |
|
1572 $ hg fateoriginlog --hidden |
1466 @ 0b997eb7ceee |
1573 @ 0b997eb7ceee |
|
1574 | Obsorigin: reworded using amend from 6:4a004186e638 |
1467 | |
1575 | |
1468 | * b18bc8331526 |
1576 | * b18bc8331526 |
1469 |/ |
1577 |/ Obsorigin: reworded using amend from 6:4a004186e638 |
|
1578 | |
1470 | * ba2ed02b0c9a |
1579 | * ba2ed02b0c9a |
|
1580 | | Obsorigin: split from 4:9bd10a0775e4 |
1471 | | |
1581 | | |
1472 | x 4a004186e638 |
1582 | x 4a004186e638 |
1473 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee |
1583 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee |
|
1584 | Obsorigin: split from 4:9bd10a0775e4 |
1474 | |
1585 | |
1475 * dd800401bd8c |
1586 * dd800401bd8c |
|
1587 | Obsorigin: split from 4:9bd10a0775e4 |
1476 | |
1588 | |
1477 | x 9bd10a0775e4 |
1589 | x 9bd10a0775e4 |
1478 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1590 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1479 | |
1591 | |
1480 o f897c6137566 |
1592 o f897c6137566 |
|
1593 | Obsorigin: rewritten from 2:0dec01379d3b |
1481 | |
1594 | |
1482 | x 0dec01379d3b |
1595 | x 0dec01379d3b |
1483 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
1596 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
|
1597 | | Obsorigin: rewritten from 1:471f378eab4c |
1484 | | |
1598 | | |
1485 | x 471f378eab4c |
1599 | x 471f378eab4c |
1486 |/ Obsfate: rewritten as 2:0dec01379d3b |
1600 |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1601 | Obsorigin: rewritten from 2:0dec01379d3b |
1487 | |
1602 | |
1488 o ea207398892e |
1603 o ea207398892e |
1489 |
1604 |
1490 $ hg up --hidden 4 |
1605 $ hg up --hidden 4 |
1491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1606 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1497 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
1612 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
1498 $ hg tlog |
1613 $ hg tlog |
1499 * eceed8f98ffc |
1614 * eceed8f98ffc |
1500 | Predecessors: 4:9bd10a0775e4 |
1615 | Predecessors: 4:9bd10a0775e4 |
1501 | semi-colon: 4:9bd10a0775e4 |
1616 | semi-colon: 4:9bd10a0775e4 |
|
1617 | Origin: rewritten using rebase from 4:9bd10a0775e4 |
|
1618 | |
1502 | * 0b997eb7ceee |
1619 | * 0b997eb7ceee |
1503 | | Predecessors: 4:9bd10a0775e4 |
1620 | | Predecessors: 4:9bd10a0775e4 |
1504 | | semi-colon: 4:9bd10a0775e4 |
1621 | | semi-colon: 4:9bd10a0775e4 |
|
1622 | | Origin: rewritten using amend from 4:9bd10a0775e4 |
|
1623 | | |
1505 * | b18bc8331526 |
1624 * | b18bc8331526 |
1506 |/ Predecessors: 4:9bd10a0775e4 |
1625 |/ Predecessors: 4:9bd10a0775e4 |
1507 | semi-colon: 4:9bd10a0775e4 |
1626 | semi-colon: 4:9bd10a0775e4 |
|
1627 | Origin: rewritten using amend from 4:9bd10a0775e4 |
|
1628 | |
1508 * dd800401bd8c |
1629 * dd800401bd8c |
1509 | Predecessors: 4:9bd10a0775e4 |
1630 | Predecessors: 4:9bd10a0775e4 |
1510 | semi-colon: 4:9bd10a0775e4 |
1631 | semi-colon: 4:9bd10a0775e4 |
|
1632 | Origin: split from 4:9bd10a0775e4 |
|
1633 | |
1511 | @ 9bd10a0775e4 |
1634 | @ 9bd10a0775e4 |
1512 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1635 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1513 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1636 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1514 | Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc |
1637 | Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc |
1515 | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1638 | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1516 | |
1639 | |
1517 o f897c6137566 |
1640 o f897c6137566 |
1518 | |
1641 | |
1519 o ea207398892e |
1642 o ea207398892e |
1520 |
1643 |
1521 $ hg fatelog |
1644 $ hg fateoriginlog |
1522 * eceed8f98ffc |
1645 * eceed8f98ffc |
|
1646 | Obsorigin: rewritten using rebase from 4:9bd10a0775e4 |
1523 | |
1647 | |
1524 | * 0b997eb7ceee |
1648 | * 0b997eb7ceee |
|
1649 | | Obsorigin: rewritten using amend from 4:9bd10a0775e4 |
1525 | | |
1650 | | |
1526 * | b18bc8331526 |
1651 * | b18bc8331526 |
1527 |/ |
1652 |/ Obsorigin: rewritten using amend from 4:9bd10a0775e4 |
|
1653 | |
1528 * dd800401bd8c |
1654 * dd800401bd8c |
|
1655 | Obsorigin: split from 4:9bd10a0775e4 |
1529 | |
1656 | |
1530 | @ 9bd10a0775e4 |
1657 | @ 9bd10a0775e4 |
1531 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1658 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1532 | |
1659 | |
1533 o f897c6137566 |
1660 o f897c6137566 |
1562 @ 471f378eab4c |
1689 @ 471f378eab4c |
1563 | Fate: pruned using prune |
1690 | Fate: pruned using prune |
1564 | |
1691 | |
1565 o ea207398892e |
1692 o ea207398892e |
1566 |
1693 |
1567 $ hg fatelog -v |
1694 $ hg fateoriginlog -v |
1568 @ 471f378eab4c |
1695 @ 471f378eab4c |
1569 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000) |
1696 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000) |
1570 | |
1697 | |
1571 o ea207398892e |
1698 o ea207398892e |
1572 |
1699 |
|
1700 |
|
1701 Test templates when having multiple unrelated predecessors |
|
1702 ========================================================== |
|
1703 |
|
1704 $ hg init $TESTTMP/templates-local-multipreds |
|
1705 $ cd $TESTTMP/templates-local-multipreds |
|
1706 $ mkcommit R |
|
1707 $ mkcommit A |
|
1708 $ mkcommit B |
|
1709 $ hg up 'desc(R)' |
|
1710 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1711 $ mkcommit C |
|
1712 created new head |
|
1713 $ hg up 'desc(R)' |
|
1714 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1715 $ mkcommit Z |
|
1716 created new head |
|
1717 $ hg up 'desc(R)' |
|
1718 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1719 $ hg prune -r 'desc(A) + desc(B)' -s 'desc(Z)' --fold |
|
1720 2 changesets pruned |
|
1721 $ hg prune -r 'desc(C)' -s 'desc(Z)' |
|
1722 1 changesets pruned |
|
1723 $ hg debugobsolete |
|
1724 944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'fold-id': 'c59cbeaa', 'fold-idx': '1', 'fold-size': '2', 'operation': 'prune', 'user': 'test'} |
|
1725 36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'fold-id': 'c59cbeaa', 'fold-idx': '2', 'fold-size': '2', 'operation': 'prune', 'user': 'test'} |
|
1726 5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
1727 $ hg tlog |
|
1728 o 4568aafd15c0 |
|
1729 | |
|
1730 @ 7ca5bfdbe243 |
|
1731 |
|
1732 $ hg tlog --hidden |
|
1733 o 4568aafd15c0 |
|
1734 | Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1 |
|
1735 | semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1 |
|
1736 | Origin: folded using prune from 1:944ade52b6a1, 2:36ca49338d3a |
|
1737 | Origin: rewritten using prune from 3:5b3370228fe5 |
|
1738 | |
|
1739 | x 5b3370228fe5 |
|
1740 |/ Successors: 4:4568aafd15c0 |
|
1741 | semi-colon: 4:4568aafd15c0 |
|
1742 | Fate: rewritten using prune as 4:4568aafd15c0 |
|
1743 | |
|
1744 | x 36ca49338d3a |
|
1745 | | Successors: 4:4568aafd15c0 |
|
1746 | | semi-colon: 4:4568aafd15c0 |
|
1747 | | Fate: folded using prune as 4:4568aafd15c0 |
|
1748 | | |
|
1749 | x 944ade52b6a1 |
|
1750 |/ Successors: 4:4568aafd15c0 |
|
1751 | semi-colon: 4:4568aafd15c0 |
|
1752 | Fate: folded using prune as 4:4568aafd15c0 |
|
1753 | |
|
1754 @ 7ca5bfdbe243 |
|
1755 |