Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3001:67b59d1657cf mercurial-4.2
compat-test: merge future 6.7.0 into 4.2 compat branch
Couple feature to disable and other various test impact.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 27 Sep 2017 01:07:22 +0200 |
parents | 2280461343e5 bd7e8be29542 |
children | 00e4d31b8cdb 9c9c8c1eeb93 |
comparison
equal
deleted
inserted
replaced
2808:f47ed78ab17b | 3001:67b59d1657cf |
---|---|
74 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 |
75 $ hg olog tip | 75 $ hg olog tip |
76 o d004c8f274b9 (4) A2 | 76 o d004c8f274b9 (4) A2 |
77 | | 77 | |
78 x a468dc9b3633 (3) A1 | 78 x a468dc9b3633 (3) A1 |
79 | rewritten(description) by test2 (*) as d004c8f274b9 (glob) | 79 | rewritten(description) as d004c8f274b9 by test2 (*) (glob) |
80 | | 80 | |
81 @ 471f378eab4c (1) A0 | 81 @ 471f378eab4c (1) A0 |
82 rewritten(description, content) by test1 (*) as a468dc9b3633 (glob) | 82 rewritten(description, content) as a468dc9b3633 by test1 (*) (glob) |
83 | 83 |
84 $ hg tlog | 84 $ hg tlog |
85 o d004c8f274b9 | 85 o d004c8f274b9 |
86 | Precursors: 471f378eab4c | 86 | Precursors: 471f378eab4c |
87 | semi-colon: 471f378eab4c | 87 | semi-colon: 471f378eab4c |
88 | @ 471f378eab4c | 88 | @ 471f378eab4c |
89 |/ Successors: [d004c8f274b9] | 89 |/ Successors: [d004c8f274b9] |
90 | semi-colon: [d004c8f274b9] | 90 | semi-colon: [d004c8f274b9] |
91 | Fate: rewritten by test1, test2 as d004c8f274b9 | 91 | Fate: rewritten as d004c8f274b9 by test1, test2 |
92 | | 92 | |
93 o ea207398892e | 93 o ea207398892e |
94 | 94 |
95 $ hg fatelog -q | 95 $ hg fatelog -q |
96 o d004c8f274b9 | 96 o d004c8f274b9 |
103 | 103 |
104 $ hg fatelog | 104 $ hg fatelog |
105 o d004c8f274b9 | 105 o d004c8f274b9 |
106 | | 106 | |
107 | @ 471f378eab4c | 107 | @ 471f378eab4c |
108 |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 | 108 |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 |
109 | | 109 | |
110 o ea207398892e | 110 o ea207398892e |
111 | 111 |
112 $ hg fatelog -v | 112 $ hg fatelog -v |
113 o d004c8f274b9 | 113 o d004c8f274b9 |
114 | | 114 | |
115 | @ 471f378eab4c | 115 | @ 471f378eab4c |
116 |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between * and *) (glob) | 116 |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 (*) (glob) |
117 | | 117 | |
118 o ea207398892e | 118 o ea207398892e |
119 | 119 |
120 | 120 |
121 (check json) | 121 (check json) |
147 | Precursors: a468dc9b3633 | 147 | Precursors: a468dc9b3633 |
148 | semi-colon: a468dc9b3633 | 148 | semi-colon: a468dc9b3633 |
149 | @ a468dc9b3633 | 149 | @ a468dc9b3633 |
150 |/ Successors: [d004c8f274b9] | 150 |/ Successors: [d004c8f274b9] |
151 | semi-colon: [d004c8f274b9] | 151 | semi-colon: [d004c8f274b9] |
152 | Fate: rewritten by test2 as d004c8f274b9 | 152 | Fate: reworded as d004c8f274b9 by test2 |
153 | | 153 | |
154 o ea207398892e | 154 o ea207398892e |
155 | 155 |
156 Precursors template should show the precursor as we force its display with | 156 Precursors template should show the precursor as we force its display with |
157 --hidden | 157 --hidden |
162 | @ a468dc9b3633 | 162 | @ a468dc9b3633 |
163 |/ Precursors: 471f378eab4c | 163 |/ Precursors: 471f378eab4c |
164 | semi-colon: 471f378eab4c | 164 | semi-colon: 471f378eab4c |
165 | Successors: [d004c8f274b9] | 165 | Successors: [d004c8f274b9] |
166 | semi-colon: [d004c8f274b9] | 166 | semi-colon: [d004c8f274b9] |
167 | Fate: rewritten by test2 as d004c8f274b9 | 167 | Fate: reworded as d004c8f274b9 by test2 |
168 | | 168 | |
169 | x f137d23bb3e1 | 169 | x f137d23bb3e1 |
170 | | Fate: pruned by test1 | 170 | | Fate: pruned by test1 |
171 | | | 171 | | |
172 | x 471f378eab4c | 172 | x 471f378eab4c |
173 |/ Successors: [a468dc9b3633] | 173 |/ Successors: [a468dc9b3633] |
174 | semi-colon: [a468dc9b3633] | 174 | semi-colon: [a468dc9b3633] |
175 | Fate: rewritten by test1 as a468dc9b3633 | 175 | Fate: rewritten as a468dc9b3633 by test1 |
176 | | 176 | |
177 o ea207398892e | 177 o ea207398892e |
178 | 178 |
179 $ hg fatelog -v | 179 $ hg fatelog -v |
180 o d004c8f274b9 | 180 o d004c8f274b9 |
181 | | 181 | |
182 | @ a468dc9b3633 | 182 | @ a468dc9b3633 |
183 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob) | 183 |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) |
184 | | 184 | |
185 o ea207398892e | 185 o ea207398892e |
186 | 186 |
187 $ hg up 'desc(A2)' | 187 $ hg up 'desc(A2)' |
188 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 |
198 | x a468dc9b3633 | 198 | x a468dc9b3633 |
199 |/ Precursors: 471f378eab4c | 199 |/ Precursors: 471f378eab4c |
200 | semi-colon: 471f378eab4c | 200 | semi-colon: 471f378eab4c |
201 | Successors: [d004c8f274b9] | 201 | Successors: [d004c8f274b9] |
202 | semi-colon: [d004c8f274b9] | 202 | semi-colon: [d004c8f274b9] |
203 | Fate: rewritten by test2 as d004c8f274b9 | 203 | Fate: reworded as d004c8f274b9 by test2 |
204 | | 204 | |
205 | x f137d23bb3e1 | 205 | x f137d23bb3e1 |
206 | | Fate: pruned by test1 | 206 | | Fate: pruned by test1 |
207 | | | 207 | | |
208 | x 471f378eab4c | 208 | x 471f378eab4c |
209 |/ Successors: [a468dc9b3633] | 209 |/ Successors: [a468dc9b3633] |
210 | semi-colon: [a468dc9b3633] | 210 | semi-colon: [a468dc9b3633] |
211 | Fate: rewritten by test1 as a468dc9b3633 | 211 | Fate: rewritten as a468dc9b3633 by test1 |
212 | | 212 | |
213 o ea207398892e | 213 o ea207398892e |
214 | 214 |
215 $ hg fatelog -v | 215 $ hg fatelog -v |
216 @ d004c8f274b9 | 216 @ d004c8f274b9 |
220 | 220 |
221 $ hg fatelog -v --hidden | 221 $ hg fatelog -v --hidden |
222 @ d004c8f274b9 | 222 @ d004c8f274b9 |
223 | | 223 | |
224 | x a468dc9b3633 | 224 | x a468dc9b3633 |
225 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob) | 225 |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) |
226 | | 226 | |
227 | x f137d23bb3e1 | 227 | x f137d23bb3e1 |
228 | | Obsfate: pruned by test1 (at *) (glob) | 228 | | Obsfate: pruned by test1 (at *) (glob) |
229 | | | 229 | | |
230 | x 471f378eab4c | 230 | x 471f378eab4c |
231 |/ Obsfate: rewritten by test1 as a468dc9b3633 (at *) (glob) | 231 |/ Obsfate: rewritten as a468dc9b3633 by test1 (*) (glob) |
232 | | 232 | |
233 o ea207398892e | 233 o ea207398892e |
234 | 234 |
235 | 235 |
236 $ hg fatelogjson --hidden | 236 $ hg fatelogjson --hidden |
237 @ d004c8f274b9 "" | 237 @ d004c8f274b9 "" |
238 | | 238 | |
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) | 239 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob) |
240 |/ | 240 |/ |
241 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] (glob) | 241 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] (glob) |
242 | | | 242 | | |
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) | 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) |
244 |/ | 244 |/ |
644 --------------- | 644 --------------- |
645 | 645 |
646 $ hg up 'desc(A0)' --hidden | 646 $ hg up 'desc(A0)' --hidden |
647 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 647 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
648 working directory parent is obsolete! (471f378eab4c) | 648 working directory parent is obsolete! (471f378eab4c) |
649 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) | 649 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
650 | 650 |
651 Precursors template should show current revision as it is the working copy | 651 Precursors template should show current revision as it is the working copy |
652 $ hg tlog | 652 $ hg tlog |
653 o 019fadeab383 | 653 o 019fadeab383 |
654 | Precursors: 471f378eab4c | 654 | Precursors: 471f378eab4c |
657 |/ Precursors: 471f378eab4c | 657 |/ Precursors: 471f378eab4c |
658 | semi-colon: 471f378eab4c | 658 | semi-colon: 471f378eab4c |
659 | @ 471f378eab4c | 659 | @ 471f378eab4c |
660 |/ Successors: [fdf9bde5129a], [019fadeab383] | 660 |/ Successors: [fdf9bde5129a], [019fadeab383] |
661 | semi-colon: [fdf9bde5129a]; [019fadeab383] | 661 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
662 | Fate: rewritten as fdf9bde5129a | 662 | Fate: reworded as fdf9bde5129a |
663 | Fate: rewritten as 019fadeab383 | 663 | Fate: reworded as 019fadeab383 |
664 | | 664 | |
665 o ea207398892e | 665 o ea207398892e |
666 | 666 |
667 $ hg fatelog | 667 $ hg fatelog |
668 o 019fadeab383 | 668 o 019fadeab383 |
669 | | 669 | |
670 | o fdf9bde5129a | 670 | o fdf9bde5129a |
671 |/ | 671 |/ |
672 | @ 471f378eab4c | 672 | @ 471f378eab4c |
673 |/ Obsfate: rewritten as fdf9bde5129a; rewritten as 019fadeab383 | 673 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383 |
674 | | 674 | |
675 o ea207398892e | 675 o ea207398892e |
676 | 676 |
677 | 677 |
678 $ hg up 'desc(A1)' | 678 $ hg up 'desc(A1)' |
702 | x 65b757b745b9 | 702 | x 65b757b745b9 |
703 |/ Precursors: 471f378eab4c | 703 |/ Precursors: 471f378eab4c |
704 | semi-colon: 471f378eab4c | 704 | semi-colon: 471f378eab4c |
705 | Successors: [019fadeab383] | 705 | Successors: [019fadeab383] |
706 | semi-colon: [019fadeab383] | 706 | semi-colon: [019fadeab383] |
707 | Fate: rewritten as 019fadeab383 | 707 | Fate: reworded as 019fadeab383 |
708 | | 708 | |
709 | @ fdf9bde5129a | 709 | @ fdf9bde5129a |
710 |/ Precursors: 471f378eab4c | 710 |/ Precursors: 471f378eab4c |
711 | semi-colon: 471f378eab4c | 711 | semi-colon: 471f378eab4c |
712 | x 471f378eab4c | 712 | x 471f378eab4c |
713 |/ Successors: [fdf9bde5129a], [65b757b745b9] | 713 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
714 | semi-colon: [fdf9bde5129a]; [65b757b745b9] | 714 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
715 | Fate: rewritten as fdf9bde5129a | 715 | Fate: reworded as fdf9bde5129a |
716 | Fate: rewritten as 65b757b745b9 | 716 | Fate: reworded as 65b757b745b9 |
717 | | 717 | |
718 o ea207398892e | 718 o ea207398892e |
719 | 719 |
720 $ hg fatelog --hidden | 720 $ hg fatelog --hidden |
721 o 019fadeab383 | 721 o 019fadeab383 |
722 | | 722 | |
723 | x 65b757b745b9 | 723 | x 65b757b745b9 |
724 |/ Obsfate: rewritten as 019fadeab383 | 724 |/ Obsfate: reworded as 019fadeab383 |
725 | | 725 | |
726 | @ fdf9bde5129a | 726 | @ fdf9bde5129a |
727 |/ | 727 |/ |
728 | x 471f378eab4c | 728 | x 471f378eab4c |
729 |/ Obsfate: rewritten as fdf9bde5129a; rewritten as 65b757b745b9 | 729 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9 |
730 | | 730 | |
731 o ea207398892e | 731 o ea207398892e |
732 | 732 |
733 | 733 |
734 $ hg fatelogjson --hidden | 734 $ hg fatelogjson --hidden |
735 o 019fadeab383 "" | 735 o 019fadeab383 "" |
736 | | 736 | |
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) | 737 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob) |
738 |/ | 738 |/ |
739 | @ fdf9bde5129a "" | 739 | @ fdf9bde5129a "" |
740 |/ | 740 |/ |
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) | 741 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob) |
742 |/ | 742 |/ |
743 o ea207398892e "" | 743 o ea207398892e "" |
744 | 744 |
745 | 745 |
746 Test templates with amended + folded commit | 746 Test templates with amended + folded commit |
919 | | Fate: rewritten as eb5a0daa2192 | 919 | | Fate: rewritten as eb5a0daa2192 |
920 | | | 920 | | |
921 | | x 0dec01379d3b | 921 | | x 0dec01379d3b |
922 | |/ Successors: [b7ea6d14e664] | 922 | |/ Successors: [b7ea6d14e664] |
923 | | semi-colon: [b7ea6d14e664] | 923 | | semi-colon: [b7ea6d14e664] |
924 | | Fate: rewritten as b7ea6d14e664 | 924 | | Fate: reworded as b7ea6d14e664 |
925 | | | 925 | | |
926 | x 471f378eab4c | 926 | x 471f378eab4c |
927 |/ Successors: [eb5a0daa2192] | 927 |/ Successors: [eb5a0daa2192] |
928 | semi-colon: [eb5a0daa2192] | 928 | semi-colon: [eb5a0daa2192] |
929 | Fate: rewritten as eb5a0daa2192 | 929 | Fate: rewritten as eb5a0daa2192 |
935 | | 935 | |
936 | x b7ea6d14e664 | 936 | x b7ea6d14e664 |
937 | | Obsfate: rewritten as eb5a0daa2192 | 937 | | Obsfate: rewritten as eb5a0daa2192 |
938 | | | 938 | | |
939 | | x 0dec01379d3b | 939 | | x 0dec01379d3b |
940 | |/ Obsfate: rewritten as b7ea6d14e664 | 940 | |/ Obsfate: reworded as b7ea6d14e664 |
941 | | | 941 | | |
942 | x 471f378eab4c | 942 | x 471f378eab4c |
943 |/ Obsfate: rewritten as eb5a0daa2192 | 943 |/ Obsfate: rewritten as eb5a0daa2192 |
944 | | 944 | |
945 o ea207398892e | 945 o ea207398892e |
947 $ hg fatelogjson --hidden | 947 $ hg fatelogjson --hidden |
948 @ eb5a0daa2192 "" | 948 @ eb5a0daa2192 "" |
949 | | 949 | |
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) | 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) |
951 | | | 951 | | |
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) | 952 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob) |
953 | |/ | 953 | |/ |
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) | 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) |
955 |/ | 955 |/ |
956 o ea207398892e "" | 956 o ea207398892e "" |
957 | 957 |
1047 | Precursors: 471f378eab4c | 1047 | Precursors: 471f378eab4c |
1048 | semi-colon: 471f378eab4c | 1048 | semi-colon: 471f378eab4c |
1049 | @ 471f378eab4c | 1049 | @ 471f378eab4c |
1050 |/ Successors: [7a230b46bf61] | 1050 |/ Successors: [7a230b46bf61] |
1051 | semi-colon: [7a230b46bf61] | 1051 | semi-colon: [7a230b46bf61] |
1052 | Fate: rewritten as 7a230b46bf61 | 1052 | Fate: reworded as 7a230b46bf61 |
1053 | | 1053 | |
1054 o ea207398892e | 1054 o ea207398892e |
1055 | 1055 |
1056 $ hg fatelog --hidden -v | 1056 $ hg fatelog --hidden -v |
1057 o 7a230b46bf61 | 1057 o 7a230b46bf61 |
1058 | | 1058 | |
1059 | @ 471f378eab4c | 1059 | @ 471f378eab4c |
1060 |/ Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob) | 1060 |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) |
1061 | | 1061 | |
1062 o ea207398892e | 1062 o ea207398892e |
1063 | 1063 |
1064 $ hg up 'desc(A2)' | 1064 $ hg up 'desc(A2)' |
1065 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 |
1078 | Precursors: 471f378eab4c | 1078 | Precursors: 471f378eab4c |
1079 | semi-colon: 471f378eab4c | 1079 | semi-colon: 471f378eab4c |
1080 | x 471f378eab4c | 1080 | x 471f378eab4c |
1081 |/ Successors: [7a230b46bf61] | 1081 |/ Successors: [7a230b46bf61] |
1082 | semi-colon: [7a230b46bf61] | 1082 | semi-colon: [7a230b46bf61] |
1083 | Fate: rewritten as 7a230b46bf61 | 1083 | Fate: reworded as 7a230b46bf61 |
1084 | | 1084 | |
1085 o ea207398892e | 1085 o ea207398892e |
1086 | 1086 |
1087 $ hg fatelog --hidden -v | 1087 $ hg fatelog --hidden -v |
1088 @ 7a230b46bf61 | 1088 @ 7a230b46bf61 |
1089 | | 1089 | |
1090 | x 471f378eab4c | 1090 | x 471f378eab4c |
1091 |/ Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob) | 1091 |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) |
1092 | | 1092 | |
1093 o ea207398892e | 1093 o ea207398892e |
1094 | 1094 |
1095 | 1095 |
1096 $ hg fatelogjson --hidden | 1096 $ hg fatelogjson --hidden |
1097 @ 7a230b46bf61 "" | 1097 @ 7a230b46bf61 "" |
1098 | | 1098 | |
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) | 1099 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob) |
1100 |/ | 1100 |/ |
1101 o ea207398892e "" | 1101 o ea207398892e "" |
1102 | 1102 |
1103 | 1103 |
1104 Test templates with pruned commits | 1104 Test templates with pruned commits |