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 |
691 Predecessors template should show current revision as it is the working copy |
650 $ hg tlog |
692 $ hg tlog |
651 * 019fadeab383 |
693 * 019fadeab383 |
652 | Predecessors: 1:471f378eab4c |
694 | Predecessors: 1:471f378eab4c |
653 | semi-colon: 1:471f378eab4c |
695 | semi-colon: 1:471f378eab4c |
|
696 | Origin: reworded using amend from 1:471f378eab4c |
|
697 | |
654 | * fdf9bde5129a |
698 | * fdf9bde5129a |
655 |/ Predecessors: 1:471f378eab4c |
699 |/ Predecessors: 1:471f378eab4c |
656 | semi-colon: 1:471f378eab4c |
700 | semi-colon: 1:471f378eab4c |
|
701 | Origin: reworded using amend from 1:471f378eab4c |
|
702 | |
657 | @ 471f378eab4c |
703 | @ 471f378eab4c |
658 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
704 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
659 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
705 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
660 | Fate: reworded using amend as 2:fdf9bde5129a |
706 | Fate: reworded using amend as 2:fdf9bde5129a |
661 | Fate: reworded using amend as 4:019fadeab383 |
707 | Fate: reworded using amend as 4:019fadeab383 |
662 | |
708 | |
663 o ea207398892e |
709 o ea207398892e |
664 |
710 |
665 $ hg fatelog |
711 $ hg fateoriginlog |
666 * 019fadeab383 |
712 * 019fadeab383 |
|
713 | Obsorigin: reworded using amend from 1:471f378eab4c |
667 | |
714 | |
668 | * fdf9bde5129a |
715 | * fdf9bde5129a |
669 |/ |
716 |/ Obsorigin: reworded using amend from 1:471f378eab4c |
|
717 | |
670 | @ 471f378eab4c |
718 | @ 471f378eab4c |
671 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 |
719 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 |
672 | |
720 | |
673 o ea207398892e |
721 o ea207398892e |
674 |
722 |
695 Predecessors template should a precursor as we force its display with --hidden |
743 Predecessors template should a precursor as we force its display with --hidden |
696 $ hg tlog --hidden |
744 $ hg tlog --hidden |
697 * 019fadeab383 |
745 * 019fadeab383 |
698 | Predecessors: 3:65b757b745b9 |
746 | Predecessors: 3:65b757b745b9 |
699 | semi-colon: 3:65b757b745b9 |
747 | semi-colon: 3:65b757b745b9 |
|
748 | Origin: reworded using amend from 3:65b757b745b9 |
|
749 | |
700 | x 65b757b745b9 |
750 | x 65b757b745b9 |
701 |/ Predecessors: 1:471f378eab4c |
751 |/ Predecessors: 1:471f378eab4c |
702 | semi-colon: 1:471f378eab4c |
752 | semi-colon: 1:471f378eab4c |
703 | Successors: 4:019fadeab383 |
753 | Successors: 4:019fadeab383 |
704 | semi-colon: 4:019fadeab383 |
754 | semi-colon: 4:019fadeab383 |
705 | Fate: reworded using amend as 4:019fadeab383 |
755 | Fate: reworded using amend as 4:019fadeab383 |
|
756 | Origin: reworded using amend from 1:471f378eab4c |
706 | |
757 | |
707 | @ fdf9bde5129a |
758 | @ fdf9bde5129a |
708 |/ Predecessors: 1:471f378eab4c |
759 |/ Predecessors: 1:471f378eab4c |
709 | semi-colon: 1:471f378eab4c |
760 | semi-colon: 1:471f378eab4c |
|
761 | Origin: reworded using amend from 1:471f378eab4c |
|
762 | |
710 | x 471f378eab4c |
763 | x 471f378eab4c |
711 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
764 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
712 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
765 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
713 | Fate: reworded using amend as 2:fdf9bde5129a |
766 | Fate: reworded using amend as 2:fdf9bde5129a |
714 | Fate: reworded using amend as 3:65b757b745b9 |
767 | Fate: reworded using amend as 3:65b757b745b9 |
715 | |
768 | |
716 o ea207398892e |
769 o ea207398892e |
717 |
770 |
718 $ hg fatelog --hidden |
771 $ hg fateoriginlog --hidden |
719 * 019fadeab383 |
772 * 019fadeab383 |
|
773 | Obsorigin: reworded using amend from 3:65b757b745b9 |
720 | |
774 | |
721 | x 65b757b745b9 |
775 | x 65b757b745b9 |
722 |/ Obsfate: reworded using amend as 4:019fadeab383 |
776 |/ Obsfate: reworded using amend as 4:019fadeab383 |
|
777 | Obsorigin: reworded using amend from 1:471f378eab4c |
723 | |
778 | |
724 | @ fdf9bde5129a |
779 | @ fdf9bde5129a |
725 |/ |
780 |/ Obsorigin: reworded using amend from 1:471f378eab4c |
|
781 | |
726 | x 471f378eab4c |
782 | x 471f378eab4c |
727 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
783 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
728 | |
784 | |
729 o ea207398892e |
785 o ea207398892e |
730 |
786 |
905 |
972 |
906 $ hg tlog --hidden |
973 $ hg tlog --hidden |
907 @ eb5a0daa2192 |
974 @ eb5a0daa2192 |
908 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
975 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
909 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
976 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
|
977 | Origin: rewritten using fold from 1:471f378eab4c |
|
978 | Origin: rewritten using fold from 3:b7ea6d14e664 |
|
979 | |
910 | x b7ea6d14e664 |
980 | x b7ea6d14e664 |
911 | | Predecessors: 2:0dec01379d3b |
981 | | Predecessors: 2:0dec01379d3b |
912 | | semi-colon: 2:0dec01379d3b |
982 | | semi-colon: 2:0dec01379d3b |
913 | | Successors: 4:eb5a0daa2192 |
983 | | Successors: 4:eb5a0daa2192 |
914 | | semi-colon: 4:eb5a0daa2192 |
984 | | semi-colon: 4:eb5a0daa2192 |
915 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
985 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
|
986 | | Origin: reworded using amend from 2:0dec01379d3b |
916 | | |
987 | | |
917 | | x 0dec01379d3b |
988 | | x 0dec01379d3b |
918 | |/ Successors: 3:b7ea6d14e664 |
989 | |/ Successors: 3:b7ea6d14e664 |
919 | | semi-colon: 3:b7ea6d14e664 |
990 | | semi-colon: 3:b7ea6d14e664 |
920 | | Fate: reworded using amend as 3:b7ea6d14e664 |
991 | | Fate: reworded using amend as 3:b7ea6d14e664 |
1129 (use 'hg evolve' to update to its parent successor) |
1208 (use 'hg evolve' to update to its parent successor) |
1130 $ hg tlog |
1209 $ hg tlog |
1131 o f897c6137566 |
1210 o f897c6137566 |
1132 | Predecessors: 2:0dec01379d3b |
1211 | Predecessors: 2:0dec01379d3b |
1133 | semi-colon: 2:0dec01379d3b |
1212 | semi-colon: 2:0dec01379d3b |
|
1213 | Origin: rewritten from 2:0dec01379d3b |
|
1214 | |
1134 | @ 0dec01379d3b |
1215 | @ 0dec01379d3b |
1135 | | Predecessors: 1:471f378eab4c |
1216 | | Predecessors: 1:471f378eab4c |
1136 | | semi-colon: 1:471f378eab4c |
1217 | | semi-colon: 1:471f378eab4c |
1137 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1218 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1138 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1219 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1139 | | Fate: rewritten as 3:f897c6137566 |
1220 | | Fate: rewritten as 3:f897c6137566 |
1140 | | Fate: rewritten as 1:471f378eab4c |
1221 | | Fate: rewritten as 1:471f378eab4c |
|
1222 | | Origin: rewritten from 1:471f378eab4c |
1141 | | |
1223 | | |
1142 | x 471f378eab4c |
1224 | x 471f378eab4c |
1143 |/ Predecessors: 2:0dec01379d3b |
1225 |/ Predecessors: 2:0dec01379d3b |
1144 | semi-colon: 2:0dec01379d3b |
1226 | semi-colon: 2:0dec01379d3b |
1145 | Successors: 2:0dec01379d3b |
1227 | Successors: 2:0dec01379d3b |
1146 | semi-colon: 2:0dec01379d3b |
1228 | semi-colon: 2:0dec01379d3b |
1147 | Fate: rewritten as 2:0dec01379d3b |
1229 | Fate: rewritten as 2:0dec01379d3b |
1148 | |
1230 | Origin: rewritten from 2:0dec01379d3b |
1149 o ea207398892e |
1231 | |
1150 |
1232 o ea207398892e |
1151 $ hg fatelog |
1233 |
|
1234 $ hg fateoriginlog |
1152 o f897c6137566 |
1235 o f897c6137566 |
|
1236 | Obsorigin: rewritten from 2:0dec01379d3b |
1153 | |
1237 | |
1154 | @ 0dec01379d3b |
1238 | @ 0dec01379d3b |
1155 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
1239 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
|
1240 | | Obsorigin: rewritten from 1:471f378eab4c |
1156 | | |
1241 | | |
1157 | x 471f378eab4c |
1242 | x 471f378eab4c |
1158 |/ Obsfate: rewritten as 2:0dec01379d3b |
1243 |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1244 | Obsorigin: rewritten from 2:0dec01379d3b |
1159 | |
1245 | |
1160 o ea207398892e |
1246 o ea207398892e |
1161 |
1247 |
1162 $ hg up -r "desc(A0)" --hidden |
1248 $ hg up -r "desc(A0)" --hidden |
1163 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1249 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1186 $ hg tlog |
1275 $ hg tlog |
1187 o f897c6137566 |
1276 o f897c6137566 |
1188 | |
1277 | |
1189 @ ea207398892e |
1278 @ ea207398892e |
1190 |
1279 |
1191 $ hg fatelog |
1280 $ hg fateoriginlog |
1192 o f897c6137566 |
1281 o f897c6137566 |
1193 | |
1282 | |
1194 @ ea207398892e |
1283 @ ea207398892e |
1195 |
1284 |
1196 $ hg tlog --hidden |
1285 $ hg tlog --hidden |
1197 o f897c6137566 |
1286 o f897c6137566 |
1198 | Predecessors: 2:0dec01379d3b |
1287 | Predecessors: 2:0dec01379d3b |
1199 | semi-colon: 2:0dec01379d3b |
1288 | semi-colon: 2:0dec01379d3b |
|
1289 | Origin: rewritten from 2:0dec01379d3b |
|
1290 | |
1200 | x 0dec01379d3b |
1291 | x 0dec01379d3b |
1201 | | Predecessors: 1:471f378eab4c |
1292 | | Predecessors: 1:471f378eab4c |
1202 | | semi-colon: 1:471f378eab4c |
1293 | | semi-colon: 1:471f378eab4c |
1203 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1294 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1204 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1295 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1205 | | Fate: rewritten as 3:f897c6137566 |
1296 | | Fate: rewritten as 3:f897c6137566 |
1206 | | Fate: rewritten as 1:471f378eab4c |
1297 | | Fate: rewritten as 1:471f378eab4c |
|
1298 | | Origin: rewritten from 1:471f378eab4c |
1207 | | |
1299 | | |
1208 | x 471f378eab4c |
1300 | x 471f378eab4c |
1209 |/ Predecessors: 2:0dec01379d3b |
1301 |/ Predecessors: 2:0dec01379d3b |
1210 | semi-colon: 2:0dec01379d3b |
1302 | semi-colon: 2:0dec01379d3b |
1211 | Successors: 2:0dec01379d3b |
1303 | Successors: 2:0dec01379d3b |
1212 | semi-colon: 2:0dec01379d3b |
1304 | semi-colon: 2:0dec01379d3b |
1213 | Fate: rewritten as 2:0dec01379d3b |
1305 | Fate: rewritten as 2:0dec01379d3b |
|
1306 | Origin: rewritten from 2:0dec01379d3b |
1214 | |
1307 | |
1215 @ ea207398892e |
1308 @ ea207398892e |
1216 |
1309 |
1217 Test template with split + divergence with cycles |
1310 Test template with split + divergence with cycles |
1218 ================================================= |
1311 ================================================= |
1418 |
1517 |
1419 $ hg tlog --hidden |
1518 $ hg tlog --hidden |
1420 @ 0b997eb7ceee |
1519 @ 0b997eb7ceee |
1421 | Predecessors: 6:4a004186e638 |
1520 | Predecessors: 6:4a004186e638 |
1422 | semi-colon: 6:4a004186e638 |
1521 | semi-colon: 6:4a004186e638 |
|
1522 | Origin: reworded using amend from 6:4a004186e638 |
|
1523 | |
1423 | * b18bc8331526 |
1524 | * b18bc8331526 |
1424 |/ Predecessors: 6:4a004186e638 |
1525 |/ Predecessors: 6:4a004186e638 |
1425 | semi-colon: 6:4a004186e638 |
1526 | semi-colon: 6:4a004186e638 |
|
1527 | Origin: reworded using amend from 6:4a004186e638 |
|
1528 | |
1426 | * ba2ed02b0c9a |
1529 | * ba2ed02b0c9a |
1427 | | Predecessors: 4:9bd10a0775e4 |
1530 | | Predecessors: 4:9bd10a0775e4 |
1428 | | semi-colon: 4:9bd10a0775e4 |
1531 | | semi-colon: 4:9bd10a0775e4 |
|
1532 | | Origin: split from 4:9bd10a0775e4 |
|
1533 | | |
1429 | x 4a004186e638 |
1534 | x 4a004186e638 |
1430 |/ Predecessors: 4:9bd10a0775e4 |
1535 |/ Predecessors: 4:9bd10a0775e4 |
1431 | semi-colon: 4:9bd10a0775e4 |
1536 | semi-colon: 4:9bd10a0775e4 |
1432 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1537 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1433 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1538 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1434 | Fate: reworded using amend as 8:b18bc8331526 |
1539 | Fate: reworded using amend as 8:b18bc8331526 |
1435 | Fate: reworded using amend as 9:0b997eb7ceee |
1540 | Fate: reworded using amend as 9:0b997eb7ceee |
|
1541 | Origin: split from 4:9bd10a0775e4 |
1436 | |
1542 | |
1437 * dd800401bd8c |
1543 * dd800401bd8c |
1438 | Predecessors: 4:9bd10a0775e4 |
1544 | Predecessors: 4:9bd10a0775e4 |
1439 | semi-colon: 4:9bd10a0775e4 |
1545 | semi-colon: 4:9bd10a0775e4 |
|
1546 | Origin: split from 4:9bd10a0775e4 |
|
1547 | |
1440 | x 9bd10a0775e4 |
1548 | x 9bd10a0775e4 |
1441 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1549 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1442 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1550 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1443 | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1551 | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1444 | |
1552 | |
1445 o f897c6137566 |
1553 o f897c6137566 |
1446 | Predecessors: 2:0dec01379d3b |
1554 | Predecessors: 2:0dec01379d3b |
1447 | semi-colon: 2:0dec01379d3b |
1555 | semi-colon: 2:0dec01379d3b |
|
1556 | Origin: rewritten from 2:0dec01379d3b |
|
1557 | |
1448 | x 0dec01379d3b |
1558 | x 0dec01379d3b |
1449 | | Predecessors: 1:471f378eab4c |
1559 | | Predecessors: 1:471f378eab4c |
1450 | | semi-colon: 1:471f378eab4c |
1560 | | semi-colon: 1:471f378eab4c |
1451 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1561 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1452 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1562 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1453 | | Fate: rewritten as 3:f897c6137566 |
1563 | | Fate: rewritten as 3:f897c6137566 |
1454 | | Fate: rewritten as 1:471f378eab4c |
1564 | | Fate: rewritten as 1:471f378eab4c |
|
1565 | | Origin: rewritten from 1:471f378eab4c |
1455 | | |
1566 | | |
1456 | x 471f378eab4c |
1567 | x 471f378eab4c |
1457 |/ Predecessors: 2:0dec01379d3b |
1568 |/ Predecessors: 2:0dec01379d3b |
1458 | semi-colon: 2:0dec01379d3b |
1569 | semi-colon: 2:0dec01379d3b |
1459 | Successors: 2:0dec01379d3b |
1570 | Successors: 2:0dec01379d3b |
1460 | semi-colon: 2:0dec01379d3b |
1571 | semi-colon: 2:0dec01379d3b |
1461 | Fate: rewritten as 2:0dec01379d3b |
1572 | Fate: rewritten as 2:0dec01379d3b |
1462 | |
1573 | Origin: rewritten from 2:0dec01379d3b |
1463 o ea207398892e |
1574 | |
1464 |
1575 o ea207398892e |
1465 $ hg fatelog --hidden |
1576 |
|
1577 $ hg fateoriginlog --hidden |
1466 @ 0b997eb7ceee |
1578 @ 0b997eb7ceee |
|
1579 | Obsorigin: reworded using amend from 6:4a004186e638 |
1467 | |
1580 | |
1468 | * b18bc8331526 |
1581 | * b18bc8331526 |
1469 |/ |
1582 |/ Obsorigin: reworded using amend from 6:4a004186e638 |
|
1583 | |
1470 | * ba2ed02b0c9a |
1584 | * ba2ed02b0c9a |
|
1585 | | Obsorigin: split from 4:9bd10a0775e4 |
1471 | | |
1586 | | |
1472 | x 4a004186e638 |
1587 | x 4a004186e638 |
1473 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee |
1588 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee |
|
1589 | Obsorigin: split from 4:9bd10a0775e4 |
1474 | |
1590 | |
1475 * dd800401bd8c |
1591 * dd800401bd8c |
|
1592 | Obsorigin: split from 4:9bd10a0775e4 |
1476 | |
1593 | |
1477 | x 9bd10a0775e4 |
1594 | x 9bd10a0775e4 |
1478 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1595 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1479 | |
1596 | |
1480 o f897c6137566 |
1597 o f897c6137566 |
|
1598 | Obsorigin: rewritten from 2:0dec01379d3b |
1481 | |
1599 | |
1482 | x 0dec01379d3b |
1600 | x 0dec01379d3b |
1483 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
1601 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
|
1602 | | Obsorigin: rewritten from 1:471f378eab4c |
1484 | | |
1603 | | |
1485 | x 471f378eab4c |
1604 | x 471f378eab4c |
1486 |/ Obsfate: rewritten as 2:0dec01379d3b |
1605 |/ Obsfate: rewritten as 2:0dec01379d3b |
|
1606 | Obsorigin: rewritten from 2:0dec01379d3b |
1487 | |
1607 | |
1488 o ea207398892e |
1608 o ea207398892e |
1489 |
1609 |
1490 $ hg up --hidden 4 |
1610 $ hg up --hidden 4 |
1491 updating to a hidden changeset 9bd10a0775e4 |
1611 updating to a hidden changeset 9bd10a0775e4 |
1497 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
1617 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
1498 $ hg tlog |
1618 $ hg tlog |
1499 * eceed8f98ffc |
1619 * eceed8f98ffc |
1500 | Predecessors: 4:9bd10a0775e4 |
1620 | Predecessors: 4:9bd10a0775e4 |
1501 | semi-colon: 4:9bd10a0775e4 |
1621 | semi-colon: 4:9bd10a0775e4 |
|
1622 | Origin: rewritten using rebase from 4:9bd10a0775e4 |
|
1623 | |
1502 | * 0b997eb7ceee |
1624 | * 0b997eb7ceee |
1503 | | Predecessors: 4:9bd10a0775e4 |
1625 | | Predecessors: 4:9bd10a0775e4 |
1504 | | semi-colon: 4:9bd10a0775e4 |
1626 | | semi-colon: 4:9bd10a0775e4 |
|
1627 | | Origin: rewritten using amend from 4:9bd10a0775e4 |
|
1628 | | |
1505 * | b18bc8331526 |
1629 * | b18bc8331526 |
1506 |/ Predecessors: 4:9bd10a0775e4 |
1630 |/ Predecessors: 4:9bd10a0775e4 |
1507 | semi-colon: 4:9bd10a0775e4 |
1631 | semi-colon: 4:9bd10a0775e4 |
|
1632 | Origin: rewritten using amend from 4:9bd10a0775e4 |
|
1633 | |
1508 * dd800401bd8c |
1634 * dd800401bd8c |
1509 | Predecessors: 4:9bd10a0775e4 |
1635 | Predecessors: 4:9bd10a0775e4 |
1510 | semi-colon: 4:9bd10a0775e4 |
1636 | semi-colon: 4:9bd10a0775e4 |
|
1637 | Origin: split from 4:9bd10a0775e4 |
|
1638 | |
1511 | @ 9bd10a0775e4 |
1639 | @ 9bd10a0775e4 |
1512 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1640 |/ 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 |
1641 | 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 |
1642 | 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 |
1643 | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1516 | |
1644 | |
1517 o f897c6137566 |
1645 o f897c6137566 |
1518 | |
1646 | |
1519 o ea207398892e |
1647 o ea207398892e |
1520 |
1648 |
1521 $ hg fatelog |
1649 $ hg fateoriginlog |
1522 * eceed8f98ffc |
1650 * eceed8f98ffc |
|
1651 | Obsorigin: rewritten using rebase from 4:9bd10a0775e4 |
1523 | |
1652 | |
1524 | * 0b997eb7ceee |
1653 | * 0b997eb7ceee |
|
1654 | | Obsorigin: rewritten using amend from 4:9bd10a0775e4 |
1525 | | |
1655 | | |
1526 * | b18bc8331526 |
1656 * | b18bc8331526 |
1527 |/ |
1657 |/ Obsorigin: rewritten using amend from 4:9bd10a0775e4 |
|
1658 | |
1528 * dd800401bd8c |
1659 * dd800401bd8c |
|
1660 | Obsorigin: split from 4:9bd10a0775e4 |
1529 | |
1661 | |
1530 | @ 9bd10a0775e4 |
1662 | @ 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 |
1663 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1532 | |
1664 | |
1533 o f897c6137566 |
1665 o f897c6137566 |
1562 @ 471f378eab4c |
1694 @ 471f378eab4c |
1563 | Fate: pruned using prune |
1695 | Fate: pruned using prune |
1564 | |
1696 | |
1565 o ea207398892e |
1697 o ea207398892e |
1566 |
1698 |
1567 $ hg fatelog -v |
1699 $ hg fateoriginlog -v |
1568 @ 471f378eab4c |
1700 @ 471f378eab4c |
1569 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000) |
1701 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000) |
1570 | |
1702 | |
1571 o ea207398892e |
1703 o ea207398892e |
1572 |
1704 |
|
1705 |
|
1706 Test templates when having multiple unrelated predecessors |
|
1707 ========================================================== |
|
1708 |
|
1709 $ hg init $TESTTMP/templates-local-multipreds |
|
1710 $ cd $TESTTMP/templates-local-multipreds |
|
1711 $ mkcommit R |
|
1712 $ mkcommit A |
|
1713 $ mkcommit B |
|
1714 $ hg up 'desc(R)' |
|
1715 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1716 $ mkcommit C |
|
1717 created new head |
|
1718 $ hg up 'desc(R)' |
|
1719 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1720 $ mkcommit Z |
|
1721 created new head |
|
1722 $ hg up 'desc(R)' |
|
1723 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1724 $ hg prune -r 'desc(A) + desc(B)' -s 'desc(Z)' --fold |
|
1725 2 changesets pruned |
|
1726 $ hg prune -r 'desc(C)' -s 'desc(Z)' |
|
1727 1 changesets pruned |
|
1728 $ hg debugobsolete |
|
1729 944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
1730 36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
|
1731 5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
1732 $ hg tlog |
|
1733 o 4568aafd15c0 |
|
1734 | |
|
1735 @ 7ca5bfdbe243 |
|
1736 |
|
1737 $ hg tlog --hidden |
|
1738 o 4568aafd15c0 |
|
1739 | Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1 |
|
1740 | semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1 |
|
1741 | Origin: rewritten using prune from 2:36ca49338d3a |
|
1742 | Origin: rewritten using prune from 3:5b3370228fe5 |
|
1743 | Origin: rewritten using prune from 1:944ade52b6a1 |
|
1744 | |
|
1745 | x 5b3370228fe5 |
|
1746 |/ Successors: 4:4568aafd15c0 |
|
1747 | semi-colon: 4:4568aafd15c0 |
|
1748 | Fate: rewritten using prune as 4:4568aafd15c0 |
|
1749 | |
|
1750 | x 36ca49338d3a |
|
1751 | | Successors: 4:4568aafd15c0 |
|
1752 | | semi-colon: 4:4568aafd15c0 |
|
1753 | | Fate: rewritten using prune as 4:4568aafd15c0 |
|
1754 | | |
|
1755 | x 944ade52b6a1 |
|
1756 |/ Successors: 4:4568aafd15c0 |
|
1757 | semi-colon: 4:4568aafd15c0 |
|
1758 | Fate: rewritten using prune as 4:4568aafd15c0 |
|
1759 | |
|
1760 @ 7ca5bfdbe243 |
|
1761 |