Mercurial > evolve

comparison tests/test-evolve-templates.t @ 2798:2280461343e5 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.2 with the new stable branch content
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 25 Jul 2017 03:41:15 +0200
parents e22de367fc74
children 1627153804dc 67b59d1657cf
comparison
equal deleted inserted replaced
2797:74456bc055ae 2798:2280461343e5
45 | 45 |
46 | x changeset: 3:a468dc9b3633 46 | x changeset: 3:a468dc9b3633
47 |/ parent: 0:ea207398892e 47 |/ parent: 0:ea207398892e
48 | user: test 48 | user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000 49 | date: Thu Jan 01 00:00:00 1970 +0000
50 | obsolete: rewritten by test2 as d004c8f274b9
51 | summary: A1 50 | summary: A1
52 | 51 |
53 | x changeset: 2:f137d23bb3e1 52 | x changeset: 2:f137d23bb3e1
54 | | user: test 53 | | user: test
55 | | date: Thu Jan 01 00:00:00 1970 +0000 54 | | date: Thu Jan 01 00:00:00 1970 +0000
56 | | obsolete: pruned by test1
57 | | summary: temporary amend commit for 471f378eab4c 55 | | summary: temporary amend commit for 471f378eab4c
58 | | 56 | |
59 | x changeset: 1:471f378eab4c 57 | x changeset: 1:471f378eab4c
60 |/ user: test 58 |/ user: test
61 | date: Thu Jan 01 00:00:00 1970 +0000 59 | date: Thu Jan 01 00:00:00 1970 +0000
62 | obsolete: rewritten by test1 as a468dc9b3633
63 | summary: A0 60 | summary: A0
64 | 61 |
65 o changeset: 0:ea207398892e 62 o changeset: 0:ea207398892e
66 user: test 63 user: test
67 date: Thu Jan 01 00:00:00 1970 +0000 64 date: Thu Jan 01 00:00:00 1970 +0000
77 Precursors template should show current revision as it is the working copy 74 Precursors template should show current revision as it is the working copy
78 $ hg olog tip 75 $ hg olog tip
79 o d004c8f274b9 (4) A2 76 o d004c8f274b9 (4) A2
80 | 77 |
81 x a468dc9b3633 (3) A1 78 x a468dc9b3633 (3) A1
82 | rewritten(description) by test2 (Thu Apr 19 04:25:21 2001 +0000) as d004c8f274b9 79 | rewritten(description) by test2 (*) as d004c8f274b9 (glob)
83 | 80 |
84 @ 471f378eab4c (1) A0 81 @ 471f378eab4c (1) A0
85 rewritten(description, content) by test1 (Fri Feb 13 23:31:30 2009 +0000) as a468dc9b3633 82 rewritten(description, content) by test1 (*) as a468dc9b3633 (glob)
86 83
87 $ hg tlog 84 $ hg tlog
88 o d004c8f274b9 85 o d004c8f274b9
89 | Precursors: 471f378eab4c 86 | Precursors: 471f378eab4c
90 | semi-colon: 471f378eab4c 87 | semi-colon: 471f378eab4c
114 111
115 $ hg fatelog -v 112 $ hg fatelog -v
116 o d004c8f274b9 113 o d004c8f274b9
117 | 114 |
118 | @ 471f378eab4c 115 | @ 471f378eab4c
119 |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) 116 |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between * and *) (glob)
120 | 117 |
121 o ea207398892e 118 o ea207398892e
122 119
123 120
124 (check json) 121 (check json)
181 178
182 $ hg fatelog -v 179 $ hg fatelog -v
183 o d004c8f274b9 180 o d004c8f274b9
184 | 181 |
185 | @ a468dc9b3633 182 | @ a468dc9b3633
186 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) 183 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob)
187 | 184 |
188 o ea207398892e 185 o ea207398892e
189 186
190 $ hg up 'desc(A2)' 187 $ hg up 'desc(A2)'
191 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
223 220
224 $ hg fatelog -v --hidden 221 $ hg fatelog -v --hidden
225 @ d004c8f274b9 222 @ d004c8f274b9
226 | 223 |
227 | x a468dc9b3633 224 | x a468dc9b3633
228 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) 225 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob)
229 | 226 |
230 | x f137d23bb3e1 227 | x f137d23bb3e1
231 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000) 228 | | Obsfate: pruned by test1 (at *) (glob)
232 | | 229 | |
233 | x 471f378eab4c 230 | x 471f378eab4c
234 |/ Obsfate: rewritten by test1 as a468dc9b3633 (at 2009-02-13 23:31 +0000) 231 |/ Obsfate: rewritten by test1 as a468dc9b3633 (at *) (glob)
235 | 232 |
236 o ea207398892e 233 o ea207398892e
237 234
238 235
239 $ hg fatelogjson --hidden 236 $ hg fatelogjson --hidden
240 @ d004c8f274b9 "" 237 @ d004c8f274b9 ""
241 | 238 |
242 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "rewritten"}] 239 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "rewritten"}] (glob)
243 |/ 240 |/
244 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] 241 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] (glob)
245 | | 242 | |
246 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] 243 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] (glob)
247 |/ 244 |/
248 o ea207398892e "" 245 o ea207398892e ""
249 246
250 247
251 Test templates with splitted commit 248 Test templates with splitted commit
320 | summary: A0 317 | summary: A0
321 | 318 |
322 | x changeset: 1:471597cad322 319 | x changeset: 1:471597cad322
323 |/ user: test 320 |/ user: test
324 | date: Thu Jan 01 00:00:00 1970 +0000 321 | date: Thu Jan 01 00:00:00 1970 +0000
325 | obsolete: split as 337fec4d2edc, f257fde29c7a
326 | summary: A0 322 | summary: A0
327 | 323 |
328 o changeset: 0:ea207398892e 324 o changeset: 0:ea207398892e
329 user: test 325 user: test
330 date: Thu Jan 01 00:00:00 1970 +0000 326 date: Thu Jan 01 00:00:00 1970 +0000
407 $ hg fatelogjson --hidden 403 $ hg fatelogjson --hidden
408 @ f257fde29c7a "" 404 @ f257fde29c7a ""
409 | 405 |
410 o 337fec4d2edc "" 406 o 337fec4d2edc ""
411 | 407 |
412 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] 408 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob)
413 |/ 409 |/
414 o ea207398892e "" 410 o ea207398892e ""
415 411
416 412
417 Test templates with folded commit 413 Test templates with folded commit
454 | summary: C0 450 | summary: C0
455 | 451 |
456 | x changeset: 2:0dec01379d3b 452 | x changeset: 2:0dec01379d3b
457 | | user: test 453 | | user: test
458 | | date: Thu Jan 01 00:00:00 1970 +0000 454 | | date: Thu Jan 01 00:00:00 1970 +0000
459 | | obsolete: rewritten as eb5a0daa2192
460 | | summary: B0 455 | | summary: B0
461 | | 456 | |
462 | x changeset: 1:471f378eab4c 457 | x changeset: 1:471f378eab4c
463 |/ user: test 458 |/ user: test
464 | date: Thu Jan 01 00:00:00 1970 +0000 459 | date: Thu Jan 01 00:00:00 1970 +0000
465 | obsolete: rewritten as eb5a0daa2192
466 | summary: A0 460 | summary: A0
467 | 461 |
468 o changeset: 0:ea207398892e 462 o changeset: 0:ea207398892e
469 user: test 463 user: test
470 date: Thu Jan 01 00:00:00 1970 +0000 464 date: Thu Jan 01 00:00:00 1970 +0000
574 568
575 569
576 $ hg fatelogjson --hidden 570 $ hg fatelogjson --hidden
577 @ eb5a0daa2192 "" 571 @ eb5a0daa2192 ""
578 | 572 |
579 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 573 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
580 | | 574 | |
581 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 575 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
582 |/ 576 |/
583 o ea207398892e "" 577 o ea207398892e ""
584 578
585 579
586 Test templates with divergence 580 Test templates with divergence
603 | summary: A1 597 | summary: A1
604 | 598 |
605 | x changeset: 1:471f378eab4c 599 | x changeset: 1:471f378eab4c
606 |/ user: test 600 |/ user: test
607 | date: Thu Jan 01 00:00:00 1970 +0000 601 | date: Thu Jan 01 00:00:00 1970 +0000
608 | obsolete: rewritten as fdf9bde5129a
609 | summary: A0 602 | summary: A0
610 | 603 |
611 o changeset: 0:ea207398892e 604 o changeset: 0:ea207398892e
612 user: test 605 user: test
613 date: Thu Jan 01 00:00:00 1970 +0000 606 date: Thu Jan 01 00:00:00 1970 +0000
636 | summary: A1 629 | summary: A1
637 | 630 |
638 | x changeset: 1:471f378eab4c 631 | x changeset: 1:471f378eab4c
639 |/ user: test 632 |/ user: test
640 | date: Thu Jan 01 00:00:00 1970 +0000 633 | date: Thu Jan 01 00:00:00 1970 +0000
641 | obsolete: rewritten as fdf9bde5129a
642 | obsolete: rewritten as 65b757b745b9
643 | summary: A0 634 | summary: A0
644 | 635 |
645 o changeset: 0:ea207398892e 636 o changeset: 0:ea207398892e
646 user: test 637 user: test
647 date: Thu Jan 01 00:00:00 1970 +0000 638 date: Thu Jan 01 00:00:00 1970 +0000
741 732
742 733
743 $ hg fatelogjson --hidden 734 $ hg fatelogjson --hidden
744 o 019fadeab383 "" 735 o 019fadeab383 ""
745 | 736 |
746 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "rewritten"}] 737 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "rewritten"}] (glob)
747 |/ 738 |/
748 | @ fdf9bde5129a "" 739 | @ fdf9bde5129a ""
749 |/ 740 |/
750 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "rewritten"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "rewritten"}] 741 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "rewritten"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "rewritten"}] (glob)
751 |/ 742 |/
752 o ea207398892e "" 743 o ea207398892e ""
753 744
754 745
755 Test templates with amended + folded commit 746 Test templates with amended + folded commit
773 | summary: B1 764 | summary: B1
774 | 765 |
775 | x changeset: 2:0dec01379d3b 766 | x changeset: 2:0dec01379d3b
776 |/ user: test 767 |/ user: test
777 | date: Thu Jan 01 00:00:00 1970 +0000 768 | date: Thu Jan 01 00:00:00 1970 +0000
778 | obsolete: rewritten as b7ea6d14e664
779 | summary: B0 769 | summary: B0
780 | 770 |
781 o changeset: 1:471f378eab4c 771 o changeset: 1:471f378eab4c
782 | user: test 772 | user: test
783 | date: Thu Jan 01 00:00:00 1970 +0000 773 | date: Thu Jan 01 00:00:00 1970 +0000
801 | 791 |
802 | x changeset: 3:b7ea6d14e664 792 | x changeset: 3:b7ea6d14e664
803 | | parent: 1:471f378eab4c 793 | | parent: 1:471f378eab4c
804 | | user: test 794 | | user: test
805 | | date: Thu Jan 01 00:00:00 1970 +0000 795 | | date: Thu Jan 01 00:00:00 1970 +0000
806 | | obsolete: rewritten as eb5a0daa2192
807 | | summary: B1 796 | | summary: B1
808 | | 797 | |
809 | | x changeset: 2:0dec01379d3b 798 | | x changeset: 2:0dec01379d3b
810 | |/ user: test 799 | |/ user: test
811 | | date: Thu Jan 01 00:00:00 1970 +0000 800 | | date: Thu Jan 01 00:00:00 1970 +0000
812 | | obsolete: rewritten as b7ea6d14e664
813 | | summary: B0 801 | | summary: B0
814 | | 802 | |
815 | x changeset: 1:471f378eab4c 803 | x changeset: 1:471f378eab4c
816 |/ user: test 804 |/ user: test
817 | date: Thu Jan 01 00:00:00 1970 +0000 805 | date: Thu Jan 01 00:00:00 1970 +0000
818 | obsolete: rewritten as eb5a0daa2192
819 | summary: A0 806 | summary: A0
820 | 807 |
821 o changeset: 0:ea207398892e 808 o changeset: 0:ea207398892e
822 user: test 809 user: test
823 date: Thu Jan 01 00:00:00 1970 +0000 810 date: Thu Jan 01 00:00:00 1970 +0000
958 o ea207398892e 945 o ea207398892e
959 946
960 $ hg fatelogjson --hidden 947 $ hg fatelogjson --hidden
961 @ eb5a0daa2192 "" 948 @ eb5a0daa2192 ""
962 | 949 |
963 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 950 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
964 | | 951 | |
965 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "rewritten"}] 952 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "rewritten"}] (glob)
966 | |/ 953 | |/
967 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] 954 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
968 |/ 955 |/
969 o ea207398892e "" 956 o ea207398892e ""
970 957
971 958
972 Test template with pushed and pulled obs markers 959 Test template with pushed and pulled obs markers
1008 | 995 |
1009 | x changeset: 2:fdf9bde5129a 996 | x changeset: 2:fdf9bde5129a
1010 |/ parent: 0:ea207398892e 997 |/ parent: 0:ea207398892e
1011 | user: test 998 | user: test
1012 | date: Thu Jan 01 00:00:00 1970 +0000 999 | date: Thu Jan 01 00:00:00 1970 +0000
1013 | obsolete: rewritten as 7a230b46bf61
1014 | summary: A1 1000 | summary: A1
1015 | 1001 |
1016 | x changeset: 1:471f378eab4c 1002 | x changeset: 1:471f378eab4c
1017 |/ user: test 1003 |/ user: test
1018 | date: Thu Jan 01 00:00:00 1970 +0000 1004 | date: Thu Jan 01 00:00:00 1970 +0000
1019 | obsolete: rewritten as fdf9bde5129a
1020 | summary: A0 1005 | summary: A0
1021 | 1006 |
1022 o changeset: 0:ea207398892e 1007 o changeset: 0:ea207398892e
1023 user: test 1008 user: test
1024 date: Thu Jan 01 00:00:00 1970 +0000 1009 date: Thu Jan 01 00:00:00 1970 +0000
1031 adding changesets 1016 adding changesets
1032 adding manifests 1017 adding manifests
1033 adding file changes 1018 adding file changes
1034 added 1 changesets with 0 changes to 1 files (+1 heads) 1019 added 1 changesets with 0 changes to 1 files (+1 heads)
1035 2 new obsolescence markers 1020 2 new obsolescence markers
1036 obsoleted 1 changesets
1037 (run 'hg heads' to see heads, 'hg merge' to merge) 1021 (run 'hg heads' to see heads, 'hg merge' to merge)
1038 working directory parent is obsolete! (471f378eab4c) 1022 working directory parent is obsolete! (471f378eab4c)
1039 (use 'hg evolve' to update to its successor: 7a230b46bf61) 1023 (use 'hg evolve' to update to its successor: 7a230b46bf61)
1040 $ hg log --hidden -G 1024 $ hg log --hidden -G
1041 o changeset: 2:7a230b46bf61 1025 o changeset: 2:7a230b46bf61
1046 | summary: A2 1030 | summary: A2
1047 | 1031 |
1048 | @ changeset: 1:471f378eab4c 1032 | @ changeset: 1:471f378eab4c
1049 |/ user: test 1033 |/ user: test
1050 | date: Thu Jan 01 00:00:00 1970 +0000 1034 | date: Thu Jan 01 00:00:00 1970 +0000
1051 | obsolete: rewritten as 7a230b46bf61
1052 | summary: A0 1035 | summary: A0
1053 | 1036 |
1054 o changeset: 0:ea207398892e 1037 o changeset: 0:ea207398892e
1055 user: test 1038 user: test
1056 date: Thu Jan 01 00:00:00 1970 +0000 1039 date: Thu Jan 01 00:00:00 1970 +0000
1072 1055
1073 $ hg fatelog --hidden -v 1056 $ hg fatelog --hidden -v
1074 o 7a230b46bf61 1057 o 7a230b46bf61
1075 | 1058 |
1076 | @ 471f378eab4c 1059 | @ 471f378eab4c
1077 |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) 1060 |/ Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob)
1078 | 1061 |
1079 o ea207398892e 1062 o ea207398892e
1080 1063
1081 $ hg up 'desc(A2)' 1064 $ hg up 'desc(A2)'
1082 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1065 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1103 1086
1104 $ hg fatelog --hidden -v 1087 $ hg fatelog --hidden -v
1105 @ 7a230b46bf61 1088 @ 7a230b46bf61
1106 | 1089 |
1107 | x 471f378eab4c 1090 | x 471f378eab4c
1108 |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) 1091 |/ Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob)
1109 | 1092 |
1110 o ea207398892e 1093 o ea207398892e
1111 1094
1112 1095
1113 $ hg fatelogjson --hidden 1096 $ hg fatelogjson --hidden
1114 @ 7a230b46bf61 "" 1097 @ 7a230b46bf61 ""
1115 | 1098 |
1116 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "rewritten"}] 1099 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "rewritten"}] (glob)
1117 |/ 1100 |/
1118 o ea207398892e "" 1101 o ea207398892e ""
1119 1102
1120 1103
1121 Test templates with pruned commits 1104 Test templates with pruned commits
1146 | 1129 |
1147 o ea207398892e 1130 o ea207398892e
1148 1131
1149 $ hg fatelog -v 1132 $ hg fatelog -v
1150 @ 471f378eab4c 1133 @ 471f378eab4c
1151 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) 1134 | Obsfate: pruned by test (at *) (glob)
1152 | 1135 |
1153 o ea207398892e 1136 o ea207398892e
1154 1137