15 > tlog = log -G -T '{node|short}\ |
15 > tlog = log -G -T '{node|short}\ |
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
16 > {if(precursors, "\n Precursors: {precursors}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
20 > {if(obsfate_quiet, "\n Fate: {obsfate_quiet}")}\n' |
20 > {if(obsfate, "\n Fate: {obsfate}")}\n' |
21 > fatelog = log -G -T '{node|short}\n' |
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {obsfate}\n")}' |
22 > fatelogjson = log -G -T '{node|short}\n' |
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' |
23 > EOF |
23 > EOF |
24 |
24 |
25 Test templates on amended commit |
25 Test templates on amended commit |
26 ================================ |
26 ================================ |
27 |
27 |
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: superseed as d004c8f274b9 |
91 | Fate: rewritten by test1, test2 as d004c8f274b9 |
|
92 | |
92 o ea207398892e |
93 o ea207398892e |
93 |
94 |
94 $ hg fatelog -q |
95 $ hg fatelog -q |
95 o d004c8f274b9 |
96 o d004c8f274b9 |
96 | |
97 | |
97 | @ 471f378eab4c |
98 | @ 471f378eab4c |
98 |/ |
99 |/ Obsfate: rewritten as d004c8f274b9 |
99 o ea207398892e |
100 | |
100 |
101 o ea207398892e |
|
102 |
|
103 |
101 $ hg fatelog |
104 $ hg fatelog |
102 o d004c8f274b9 |
105 o d004c8f274b9 |
103 | |
106 | |
104 | @ 471f378eab4c |
107 | @ 471f378eab4c |
105 |/ |
108 |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 |
|
109 | |
106 o ea207398892e |
110 o ea207398892e |
107 |
111 |
108 $ hg fatelog -v |
112 $ hg fatelog -v |
109 o d004c8f274b9 |
113 o d004c8f274b9 |
110 | |
114 | |
111 | @ 471f378eab4c |
115 | @ 471f378eab4c |
112 |/ |
116 |/ Obsfate: rewritten by test1, test2 as d004c8f274b9 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) |
|
117 | |
113 o ea207398892e |
118 o ea207398892e |
114 |
119 |
115 $ hg up 'desc(A1)' --hidden |
120 $ hg up 'desc(A1)' --hidden |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 working directory parent is obsolete! (a468dc9b3633) |
122 working directory parent is obsolete! (a468dc9b3633) |
137 | @ a468dc9b3633 |
143 | @ a468dc9b3633 |
138 |/ Precursors: 471f378eab4c |
144 |/ Precursors: 471f378eab4c |
139 | semi-colon: 471f378eab4c |
145 | semi-colon: 471f378eab4c |
140 | Successors: [d004c8f274b9] |
146 | Successors: [d004c8f274b9] |
141 | semi-colon: [d004c8f274b9] |
147 | semi-colon: [d004c8f274b9] |
142 | Fate: superseed as d004c8f274b9 |
148 | Fate: rewritten by test2 as d004c8f274b9 |
|
149 | |
143 | x f137d23bb3e1 |
150 | x f137d23bb3e1 |
144 | | Fate: pruned |
151 | | Fate: pruned |
|
152 | | |
145 | x 471f378eab4c |
153 | x 471f378eab4c |
146 |/ Successors: [a468dc9b3633] |
154 |/ Successors: [a468dc9b3633] |
147 | semi-colon: [a468dc9b3633] |
155 | semi-colon: [a468dc9b3633] |
148 | Fate: superseed as a468dc9b3633 |
156 | Fate: rewritten by test1 as a468dc9b3633 |
|
157 | |
149 o ea207398892e |
158 o ea207398892e |
150 |
159 |
151 $ hg fatelog -v |
160 $ hg fatelog -v |
152 o d004c8f274b9 |
161 o d004c8f274b9 |
153 | |
162 | |
154 | @ a468dc9b3633 |
163 | @ a468dc9b3633 |
155 |/ |
164 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) |
|
165 | |
156 o ea207398892e |
166 o ea207398892e |
157 |
167 |
158 $ hg up 'desc(A2)' |
168 $ hg up 'desc(A2)' |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 $ hg tlog |
170 $ hg tlog |
169 | x a468dc9b3633 |
179 | x a468dc9b3633 |
170 |/ Precursors: 471f378eab4c |
180 |/ Precursors: 471f378eab4c |
171 | semi-colon: 471f378eab4c |
181 | semi-colon: 471f378eab4c |
172 | Successors: [d004c8f274b9] |
182 | Successors: [d004c8f274b9] |
173 | semi-colon: [d004c8f274b9] |
183 | semi-colon: [d004c8f274b9] |
174 | Fate: superseed as d004c8f274b9 |
184 | Fate: rewritten by test2 as d004c8f274b9 |
|
185 | |
175 | x f137d23bb3e1 |
186 | x f137d23bb3e1 |
176 | | Fate: pruned |
187 | | Fate: pruned |
|
188 | | |
177 | x 471f378eab4c |
189 | x 471f378eab4c |
178 |/ Successors: [a468dc9b3633] |
190 |/ Successors: [a468dc9b3633] |
179 | semi-colon: [a468dc9b3633] |
191 | semi-colon: [a468dc9b3633] |
180 | Fate: superseed as a468dc9b3633 |
192 | Fate: rewritten by test1 as a468dc9b3633 |
|
193 | |
181 o ea207398892e |
194 o ea207398892e |
182 |
195 |
183 $ hg fatelog -v |
196 $ hg fatelog -v |
184 @ d004c8f274b9 |
197 @ d004c8f274b9 |
185 | |
198 | |
188 |
201 |
189 $ hg fatelog -v --hidden |
202 $ hg fatelog -v --hidden |
190 @ d004c8f274b9 |
203 @ d004c8f274b9 |
191 | |
204 | |
192 | x a468dc9b3633 |
205 | x a468dc9b3633 |
193 |/ |
206 |/ Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000) |
|
207 | |
194 | x f137d23bb3e1 |
208 | x f137d23bb3e1 |
195 | | |
209 | | Obsfate: pruned |
196 | x 471f378eab4c |
210 | | |
197 |/ |
211 | x 471f378eab4c |
|
212 |/ Obsfate: rewritten by test1 as a468dc9b3633 (at 2009-02-13 23:31 +0000) |
|
213 | |
198 o ea207398892e |
214 o ea207398892e |
199 |
215 |
200 |
216 |
201 $ hg fatelogjson --hidden |
217 $ hg fatelogjson --hidden |
202 @ d004c8f274b9 |
218 @ d004c8f274b9 "" |
203 | |
219 | |
204 | x a468dc9b3633 |
220 | x a468dc9b3633 [{"markers": [["\udca4h\u071b63\udc8b\u0014\udcfd\udcb7\udc82_U\udcce=\udcf4\udce7\u0015\u0017\udcad", ["\udcd0\u0004\udcc8\udcf2t\udcb9\udcecH\nG\udca9\u003c\u0010\udcda\udcc5\udcee\udce6:\udcdbx"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["\udcd0\u0004\udcc8\udcf2t\udcb9\udcecH\nG\udca9\u003c\u0010\udcda\udcc5\udcee\udce6:\udcdbx"], "users": ["test2"], "verb": "rewritten"}] |
205 |/ |
221 |/ |
206 | x f137d23bb3e1 |
222 | x f137d23bb3e1 [{"markers": [], "successors": [], "verb": "pruned"}] |
207 | | |
223 | | |
208 | x 471f378eab4c |
224 | x 471f378eab4c [{"markers": [["G\u001f7\udc8e\udcabL^%\udcf6\udcc7\u007fx['\udcc96\udcef\udcb2(t", ["\udca4h\u071b63\udc8b\u0014\udcfd\udcb7\udc82_U\udcce=\udcf4\udce7\u0015\u0017\udcad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["\udca4h\u071b63\udc8b\u0014\udcfd\udcb7\udc82_U\udcce=\udcf4\udce7\u0015\u0017\udcad"], "users": ["test1"], "verb": "rewritten"}] |
209 |/ |
225 |/ |
210 o ea207398892e |
226 o ea207398892e "" |
211 |
227 |
212 |
228 |
213 Test templates with splitted commit |
229 Test templates with splitted commit |
214 =================================== |
230 =================================== |
215 |
231 |
309 | Precursors: 471597cad322 |
325 | Precursors: 471597cad322 |
310 | semi-colon: 471597cad322 |
326 | semi-colon: 471597cad322 |
311 | @ 471597cad322 |
327 | @ 471597cad322 |
312 |/ Successors: [337fec4d2edc, f257fde29c7a] |
328 |/ Successors: [337fec4d2edc, f257fde29c7a] |
313 | semi-colon: [337fec4d2edc, f257fde29c7a] |
329 | semi-colon: [337fec4d2edc, f257fde29c7a] |
314 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
330 | Fate: rewritten by test as 337fec4d2edc, f257fde29c7a |
|
331 | |
315 o ea207398892e |
332 o ea207398892e |
316 |
333 |
317 $ hg fatelog |
334 $ hg fatelog |
318 o f257fde29c7a |
335 o f257fde29c7a |
319 | |
336 | |
320 o 337fec4d2edc |
337 o 337fec4d2edc |
321 | |
338 | |
322 | @ 471597cad322 |
339 | @ 471597cad322 |
323 |/ |
340 |/ Obsfate: rewritten by test as 337fec4d2edc, f257fde29c7a |
|
341 | |
324 o ea207398892e |
342 o ea207398892e |
325 |
343 |
326 |
344 |
327 $ hg up f257fde29c7a |
345 $ hg up f257fde29c7a |
328 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
346 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
346 | Precursors: 471597cad322 |
364 | Precursors: 471597cad322 |
347 | semi-colon: 471597cad322 |
365 | semi-colon: 471597cad322 |
348 | x 471597cad322 |
366 | x 471597cad322 |
349 |/ Successors: [337fec4d2edc, f257fde29c7a] |
367 |/ Successors: [337fec4d2edc, f257fde29c7a] |
350 | semi-colon: [337fec4d2edc, f257fde29c7a] |
368 | semi-colon: [337fec4d2edc, f257fde29c7a] |
351 | Fate: superseed as 337fec4d2edc,f257fde29c7a |
369 | Fate: rewritten by test as 337fec4d2edc, f257fde29c7a |
|
370 | |
352 o ea207398892e |
371 o ea207398892e |
353 |
372 |
354 $ hg fatelog --hidden |
373 $ hg fatelog --hidden |
355 @ f257fde29c7a |
374 @ f257fde29c7a |
356 | |
375 | |
357 o 337fec4d2edc |
376 o 337fec4d2edc |
358 | |
377 | |
359 | x 471597cad322 |
378 | x 471597cad322 |
360 |/ |
379 |/ Obsfate: rewritten by test as 337fec4d2edc, f257fde29c7a |
|
380 | |
361 o ea207398892e |
381 o ea207398892e |
362 |
382 |
363 |
383 |
364 $ hg fatelogjson --hidden |
384 $ hg fatelogjson --hidden |
365 @ f257fde29c7a |
385 @ f257fde29c7a "" |
366 | |
386 | |
367 o 337fec4d2edc |
387 o 337fec4d2edc "" |
368 | |
388 | |
369 | x 471597cad322 |
389 | x 471597cad322 [{"markers": [["G\u0015\udc97\udcca\udcd3\"\udcd1\udcf6Y\udcbb\u0016\udc97Q\udcbe\udc913\udcda\udcd9.\udcf3", ["3\u007f\udcecM.\udcdc\udcf0\udce7\udca4g\udce3_\udc81\udc824\udcbcb\u0000h\udcb5", "\udcf2W\udcfd\udce2\udc9cz\udc84|\udc9b`\u007fn\udc95\udc86V\udcd0\udcdf\u000f\udcb1\\"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["3\u007f\udcecM.\udcdc\udcf0\udce7\udca4g\udce3_\udc81\udc824\udcbcb\u0000h\udcb5", "\udcf2W\udcfd\udce2\udc9cz\udc84|\udc9b`\u007fn\udc95\udc86V\udcd0\udcdf\u000f\udcb1\\"], "users": ["test"], "verb": "rewritten"}] |
370 |/ |
390 |/ |
371 o ea207398892e |
391 o ea207398892e "" |
372 |
392 |
373 |
393 |
374 Test templates with folded commit |
394 Test templates with folded commit |
375 ============================== |
395 ============================== |
376 |
396 |
439 | Precursors: 471f378eab4c |
459 | Precursors: 471f378eab4c |
440 | semi-colon: 471f378eab4c |
460 | semi-colon: 471f378eab4c |
441 | @ 471f378eab4c |
461 | @ 471f378eab4c |
442 |/ Successors: [eb5a0daa2192] |
462 |/ Successors: [eb5a0daa2192] |
443 | semi-colon: [eb5a0daa2192] |
463 | semi-colon: [eb5a0daa2192] |
444 | Fate: superseed as eb5a0daa2192 |
464 | Fate: rewritten by test as eb5a0daa2192 |
|
465 | |
445 o ea207398892e |
466 o ea207398892e |
446 |
467 |
447 $ hg fatelog |
468 $ hg fatelog |
448 o eb5a0daa2192 |
469 o eb5a0daa2192 |
449 | |
470 | |
450 | @ 471f378eab4c |
471 | @ 471f378eab4c |
451 |/ |
472 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
473 | |
452 o ea207398892e |
474 o ea207398892e |
453 |
475 |
454 $ hg up 'desc(B0)' --hidden |
476 $ hg up 'desc(B0)' --hidden |
455 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
477 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
456 working directory parent is obsolete! (0dec01379d3b) |
478 working directory parent is obsolete! (0dec01379d3b) |
463 | Precursors: 0dec01379d3b 471f378eab4c |
485 | Precursors: 0dec01379d3b 471f378eab4c |
464 | semi-colon: 0dec01379d3b; 471f378eab4c |
486 | semi-colon: 0dec01379d3b; 471f378eab4c |
465 | @ 0dec01379d3b |
487 | @ 0dec01379d3b |
466 | | Successors: [eb5a0daa2192] |
488 | | Successors: [eb5a0daa2192] |
467 | | semi-colon: [eb5a0daa2192] |
489 | | semi-colon: [eb5a0daa2192] |
468 | | Fate: superseed as eb5a0daa2192 |
490 | | Fate: rewritten by test as eb5a0daa2192 |
|
491 | | |
469 | x 471f378eab4c |
492 | x 471f378eab4c |
470 |/ Successors: [eb5a0daa2192] |
493 |/ Successors: [eb5a0daa2192] |
471 | semi-colon: [eb5a0daa2192] |
494 | semi-colon: [eb5a0daa2192] |
472 | Fate: superseed as eb5a0daa2192 |
495 | Fate: rewritten by test as eb5a0daa2192 |
|
496 | |
473 o ea207398892e |
497 o ea207398892e |
474 |
498 |
475 $ hg fatelog |
499 $ hg fatelog |
476 o eb5a0daa2192 |
500 o eb5a0daa2192 |
477 | |
501 | |
478 | @ 0dec01379d3b |
502 | @ 0dec01379d3b |
479 | | |
503 | | Obsfate: rewritten by test as eb5a0daa2192 |
480 | x 471f378eab4c |
504 | | |
481 |/ |
505 | x 471f378eab4c |
|
506 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
507 | |
482 o ea207398892e |
508 o ea207398892e |
483 |
509 |
484 |
510 |
485 $ hg up 'desc(C0)' |
511 $ hg up 'desc(C0)' |
486 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
512 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499 | Precursors: 0dec01379d3b 471f378eab4c |
525 | Precursors: 0dec01379d3b 471f378eab4c |
500 | semi-colon: 0dec01379d3b; 471f378eab4c |
526 | semi-colon: 0dec01379d3b; 471f378eab4c |
501 | x 0dec01379d3b |
527 | x 0dec01379d3b |
502 | | Successors: [eb5a0daa2192] |
528 | | Successors: [eb5a0daa2192] |
503 | | semi-colon: [eb5a0daa2192] |
529 | | semi-colon: [eb5a0daa2192] |
504 | | Fate: superseed as eb5a0daa2192 |
530 | | Fate: rewritten by test as eb5a0daa2192 |
|
531 | | |
505 | x 471f378eab4c |
532 | x 471f378eab4c |
506 |/ Successors: [eb5a0daa2192] |
533 |/ Successors: [eb5a0daa2192] |
507 | semi-colon: [eb5a0daa2192] |
534 | semi-colon: [eb5a0daa2192] |
508 | Fate: superseed as eb5a0daa2192 |
535 | Fate: rewritten by test as eb5a0daa2192 |
|
536 | |
509 o ea207398892e |
537 o ea207398892e |
510 |
538 |
511 $ hg fatelog --hidden |
539 $ hg fatelog --hidden |
512 @ eb5a0daa2192 |
540 @ eb5a0daa2192 |
513 | |
541 | |
514 | x 0dec01379d3b |
542 | x 0dec01379d3b |
515 | | |
543 | | Obsfate: rewritten by test as eb5a0daa2192 |
516 | x 471f378eab4c |
544 | | |
517 |/ |
545 | x 471f378eab4c |
|
546 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
547 | |
518 o ea207398892e |
548 o ea207398892e |
519 |
549 |
520 |
550 |
521 $ hg fatelogjson --hidden |
551 $ hg fatelogjson --hidden |
522 @ eb5a0daa2192 |
552 @ eb5a0daa2192 "" |
523 | |
553 | |
524 | x 0dec01379d3b |
554 | x 0dec01379d3b [{"markers": [["\r\udcec\u00017\udc9d;\udce61\udc8cG\u000e\udcad1\udcb1\udcfez\udce7\udccbS\udcd5", ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], "users": ["test"], "verb": "rewritten"}] |
525 | | |
555 | | |
526 | x 471f378eab4c |
556 | x 471f378eab4c [{"markers": [["G\u001f7\udc8e\udcabL^%\udcf6\udcc7\u007fx['\udcc96\udcef\udcb2(t", ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], "users": ["test"], "verb": "rewritten"}] |
527 |/ |
557 |/ |
528 o ea207398892e |
558 o ea207398892e "" |
529 |
559 |
530 |
560 |
531 Test templates with divergence |
561 Test templates with divergence |
532 ============================== |
562 ============================== |
533 |
563 |
608 |/ Precursors: 471f378eab4c |
638 |/ Precursors: 471f378eab4c |
609 | semi-colon: 471f378eab4c |
639 | semi-colon: 471f378eab4c |
610 | @ 471f378eab4c |
640 | @ 471f378eab4c |
611 |/ Successors: [fdf9bde5129a], [019fadeab383] |
641 |/ Successors: [fdf9bde5129a], [019fadeab383] |
612 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
642 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
613 | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 |
643 | Fate: rewritten by test as fdf9bde5129a |
|
644 | rewritten by test as 019fadeab383 |
|
645 | |
614 o ea207398892e |
646 o ea207398892e |
615 |
647 |
616 $ hg fatelog |
648 $ hg fatelog |
617 o 019fadeab383 |
649 o 019fadeab383 |
618 | |
650 | |
619 | o fdf9bde5129a |
651 | o fdf9bde5129a |
620 |/ |
652 |/ |
621 | @ 471f378eab4c |
653 | @ 471f378eab4c |
622 |/ |
654 |/ Obsfate: rewritten by test as fdf9bde5129a |
|
655 | rewritten by test as 019fadeab383 |
|
656 | |
623 o ea207398892e |
657 o ea207398892e |
624 |
658 |
625 |
659 |
626 $ hg up 'desc(A1)' |
660 $ hg up 'desc(A1)' |
627 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
650 | x 65b757b745b9 |
684 | x 65b757b745b9 |
651 |/ Precursors: 471f378eab4c |
685 |/ Precursors: 471f378eab4c |
652 | semi-colon: 471f378eab4c |
686 | semi-colon: 471f378eab4c |
653 | Successors: [019fadeab383] |
687 | Successors: [019fadeab383] |
654 | semi-colon: [019fadeab383] |
688 | semi-colon: [019fadeab383] |
655 | Fate: superseed as 019fadeab383 |
689 | Fate: rewritten by test as 019fadeab383 |
|
690 | |
656 | @ fdf9bde5129a |
691 | @ fdf9bde5129a |
657 |/ Precursors: 471f378eab4c |
692 |/ Precursors: 471f378eab4c |
658 | semi-colon: 471f378eab4c |
693 | semi-colon: 471f378eab4c |
659 | x 471f378eab4c |
694 | x 471f378eab4c |
660 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
695 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
661 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
696 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
662 | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 |
697 | Fate: rewritten by test as fdf9bde5129a |
|
698 | rewritten by test as 65b757b745b9 |
|
699 | |
663 o ea207398892e |
700 o ea207398892e |
664 |
701 |
665 $ hg fatelog --hidden |
702 $ hg fatelog --hidden |
666 o 019fadeab383 |
703 o 019fadeab383 |
667 | |
704 | |
668 | x 65b757b745b9 |
705 | x 65b757b745b9 |
669 |/ |
706 |/ Obsfate: rewritten by test as 019fadeab383 |
|
707 | |
670 | @ fdf9bde5129a |
708 | @ fdf9bde5129a |
671 |/ |
709 |/ |
672 | x 471f378eab4c |
710 | x 471f378eab4c |
673 |/ |
711 |/ Obsfate: rewritten by test as fdf9bde5129a |
|
712 | rewritten by test as 65b757b745b9 |
|
713 | |
674 o ea207398892e |
714 o ea207398892e |
675 |
715 |
676 |
716 |
677 $ hg fatelogjson --hidden |
717 $ hg fatelogjson --hidden |
678 o 019fadeab383 |
718 o 019fadeab383 "" |
679 | |
719 | |
680 | x 65b757b745b9 |
720 | x 65b757b745b9 [{"markers": [["e\udcb7W\udcb7E\udcb95\t\u003c\udc87\udca2\udcbc\u0347u!\udccc\udccf\udcfc\udcbd", ["\u0001\udc9f\udcad\uacc3\udcf6i\udc9f\udca8:\u05fd\udcb4\udcd8.\udcd2\udcc0\udce5\udcab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\u0001\udc9f\udcad\uacc3\udcf6i\udc9f\udca8:\u05fd\udcb4\udcd8.\udcd2\udcc0\udce5\udcab"], "users": ["test"], "verb": "rewritten"}] |
681 |/ |
721 |/ |
682 | @ fdf9bde5129a |
722 | @ fdf9bde5129a "" |
683 |/ |
723 |/ |
684 | x 471f378eab4c |
724 | x 471f378eab4c [{"markers": [["G\u001f7\udc8e\udcabL^%\udcf6\udcc7\u007fx['\udcc96\udcef\udcb2(t", ["\udcfd\udcf9\udcbd\udce5\u0012\udc9a(\udcd4T\udc8f\udcad\udcd3\udcf6+&\\\udcdd;z."], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\udcfd\udcf9\udcbd\udce5\u0012\udc9a(\udcd4T\udc8f\udcad\udcd3\udcf6+&\\\udcdd;z."], "users": ["test"], "verb": "rewritten"}, {"markers": [["G\u001f7\udc8e\udcabL^%\udcf6\udcc7\u007fx['\udcc96\udcef\udcb2(t", ["e\udcb7W\udcb7E\udcb95\t\u003c\udc87\udca2\udcbc\u0347u!\udccc\udccf\udcfc\udcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["e\udcb7W\udcb7E\udcb95\t\u003c\udc87\udca2\udcbc\u0347u!\udccc\udccf\udcfc\udcbd"], "users": ["test"], "verb": "rewritten"}] |
685 |/ |
725 |/ |
686 o ea207398892e |
726 o ea207398892e "" |
687 |
727 |
688 |
728 |
689 Test templates with amended + folded commit |
729 Test templates with amended + folded commit |
690 =========================================== |
730 =========================================== |
691 |
731 |
765 | Precursors: 471f378eab4c |
805 | Precursors: 471f378eab4c |
766 | semi-colon: 471f378eab4c |
806 | semi-colon: 471f378eab4c |
767 | @ 471f378eab4c |
807 | @ 471f378eab4c |
768 |/ Successors: [eb5a0daa2192] |
808 |/ Successors: [eb5a0daa2192] |
769 | semi-colon: [eb5a0daa2192] |
809 | semi-colon: [eb5a0daa2192] |
770 | Fate: superseed as eb5a0daa2192 |
810 | Fate: rewritten by test as eb5a0daa2192 |
|
811 | |
771 o ea207398892e |
812 o ea207398892e |
772 |
813 |
773 $ hg fatelog |
814 $ hg fatelog |
774 o eb5a0daa2192 |
815 o eb5a0daa2192 |
775 | |
816 | |
776 | @ 471f378eab4c |
817 | @ 471f378eab4c |
777 |/ |
818 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
819 | |
778 o ea207398892e |
820 o ea207398892e |
779 |
821 |
780 $ hg up 'desc(B0)' --hidden |
822 $ hg up 'desc(B0)' --hidden |
781 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
823 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
782 working directory parent is obsolete! (0dec01379d3b) |
824 working directory parent is obsolete! (0dec01379d3b) |
786 | Precursors: 0dec01379d3b 471f378eab4c |
828 | Precursors: 0dec01379d3b 471f378eab4c |
787 | semi-colon: 0dec01379d3b; 471f378eab4c |
829 | semi-colon: 0dec01379d3b; 471f378eab4c |
788 | @ 0dec01379d3b |
830 | @ 0dec01379d3b |
789 | | Successors: [eb5a0daa2192] |
831 | | Successors: [eb5a0daa2192] |
790 | | semi-colon: [eb5a0daa2192] |
832 | | semi-colon: [eb5a0daa2192] |
791 | | Fate: superseed as eb5a0daa2192 |
833 | | Fate: rewritten by test as eb5a0daa2192 |
|
834 | | |
792 | x 471f378eab4c |
835 | x 471f378eab4c |
793 |/ Successors: [eb5a0daa2192] |
836 |/ Successors: [eb5a0daa2192] |
794 | semi-colon: [eb5a0daa2192] |
837 | semi-colon: [eb5a0daa2192] |
795 | Fate: superseed as eb5a0daa2192 |
838 | Fate: rewritten by test as eb5a0daa2192 |
|
839 | |
796 o ea207398892e |
840 o ea207398892e |
797 |
841 |
798 $ hg fatelog |
842 $ hg fatelog |
799 o eb5a0daa2192 |
843 o eb5a0daa2192 |
800 | |
844 | |
801 | @ 0dec01379d3b |
845 | @ 0dec01379d3b |
802 | | |
846 | | Obsfate: rewritten by test as eb5a0daa2192 |
803 | x 471f378eab4c |
847 | | |
804 |/ |
848 | x 471f378eab4c |
|
849 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
850 | |
805 o ea207398892e |
851 o ea207398892e |
806 |
852 |
807 |
853 |
808 $ hg up 'desc(B1)' --hidden |
854 $ hg up 'desc(B1)' --hidden |
809 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
855 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
814 | Precursors: 471f378eab4c b7ea6d14e664 |
860 | Precursors: 471f378eab4c b7ea6d14e664 |
815 | semi-colon: 471f378eab4c; b7ea6d14e664 |
861 | semi-colon: 471f378eab4c; b7ea6d14e664 |
816 | @ b7ea6d14e664 |
862 | @ b7ea6d14e664 |
817 | | Successors: [eb5a0daa2192] |
863 | | Successors: [eb5a0daa2192] |
818 | | semi-colon: [eb5a0daa2192] |
864 | | semi-colon: [eb5a0daa2192] |
819 | | Fate: superseed as eb5a0daa2192 |
865 | | Fate: rewritten by test as eb5a0daa2192 |
|
866 | | |
820 | x 471f378eab4c |
867 | x 471f378eab4c |
821 |/ Successors: [eb5a0daa2192] |
868 |/ Successors: [eb5a0daa2192] |
822 | semi-colon: [eb5a0daa2192] |
869 | semi-colon: [eb5a0daa2192] |
823 | Fate: superseed as eb5a0daa2192 |
870 | Fate: rewritten by test as eb5a0daa2192 |
|
871 | |
824 o ea207398892e |
872 o ea207398892e |
825 |
873 |
826 $ hg fatelog |
874 $ hg fatelog |
827 o eb5a0daa2192 |
875 o eb5a0daa2192 |
828 | |
876 | |
829 | @ b7ea6d14e664 |
877 | @ b7ea6d14e664 |
830 | | |
878 | | Obsfate: rewritten by test as eb5a0daa2192 |
831 | x 471f378eab4c |
879 | | |
832 |/ |
880 | x 471f378eab4c |
|
881 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
882 | |
833 o ea207398892e |
883 o ea207398892e |
834 |
884 |
835 |
885 |
836 $ hg up 'desc(C0)' |
886 $ hg up 'desc(C0)' |
837 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
847 | x b7ea6d14e664 |
897 | x b7ea6d14e664 |
848 | | Precursors: 0dec01379d3b |
898 | | Precursors: 0dec01379d3b |
849 | | semi-colon: 0dec01379d3b |
899 | | semi-colon: 0dec01379d3b |
850 | | Successors: [eb5a0daa2192] |
900 | | Successors: [eb5a0daa2192] |
851 | | semi-colon: [eb5a0daa2192] |
901 | | semi-colon: [eb5a0daa2192] |
852 | | Fate: superseed as eb5a0daa2192 |
902 | | Fate: rewritten by test as eb5a0daa2192 |
|
903 | | |
853 | | x 0dec01379d3b |
904 | | x 0dec01379d3b |
854 | |/ Successors: [b7ea6d14e664] |
905 | |/ Successors: [b7ea6d14e664] |
855 | | semi-colon: [b7ea6d14e664] |
906 | | semi-colon: [b7ea6d14e664] |
856 | | Fate: superseed as b7ea6d14e664 |
907 | | Fate: rewritten by test as b7ea6d14e664 |
|
908 | | |
857 | x 471f378eab4c |
909 | x 471f378eab4c |
858 |/ Successors: [eb5a0daa2192] |
910 |/ Successors: [eb5a0daa2192] |
859 | semi-colon: [eb5a0daa2192] |
911 | semi-colon: [eb5a0daa2192] |
860 | Fate: superseed as eb5a0daa2192 |
912 | Fate: rewritten by test as eb5a0daa2192 |
|
913 | |
861 o ea207398892e |
914 o ea207398892e |
862 |
915 |
863 $ hg fatelog --hidden |
916 $ hg fatelog --hidden |
864 @ eb5a0daa2192 |
917 @ eb5a0daa2192 |
865 | |
918 | |
866 | x b7ea6d14e664 |
919 | x b7ea6d14e664 |
|
920 | | Obsfate: rewritten by test as eb5a0daa2192 |
867 | | |
921 | | |
868 | | x 0dec01379d3b |
922 | | x 0dec01379d3b |
|
923 | |/ Obsfate: rewritten by test as b7ea6d14e664 |
|
924 | | |
|
925 | x 471f378eab4c |
|
926 |/ Obsfate: rewritten by test as eb5a0daa2192 |
|
927 | |
|
928 o ea207398892e |
|
929 |
|
930 $ hg fatelogjson --hidden |
|
931 @ eb5a0daa2192 "" |
|
932 | |
|
933 | x b7ea6d14e664 [{"markers": [["\udcb7\udceam\u0014\udce6d\udcbd\u0212\"!\udcf7\udc99&1\udcb5\r\udca3\udcfb\u0007", ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], "users": ["test"], "verb": "rewritten"}] |
|
934 | | |
|
935 | | x 0dec01379d3b [{"markers": [["\r\udcec\u00017\udc9d;\udce61\udc8cG\u000e\udcad1\udcb1\udcfez\udce7\udccbS\udcd5", ["\udcb7\udceam\u0014\udce6d\udcbd\u0212\"!\udcf7\udc99&1\udcb5\r\udca3\udcfb\u0007"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\udcb7\udceam\u0014\udce6d\udcbd\u0212\"!\udcf7\udc99&1\udcb5\r\udca3\udcfb\u0007"], "users": ["test"], "verb": "rewritten"}] |
869 | |/ |
936 | |/ |
870 | x 471f378eab4c |
937 | x 471f378eab4c [{"markers": [["G\u001f7\udc8e\udcabL^%\udcf6\udcc7\u007fx['\udcc96\udcef\udcb2(t", ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["\udcebZ\r\udcaa!\udc92;\udcbf\udc8c\udcae\udcb2\udcc4 \udc85\udcb9\udce4c\udc86\u001f\udcd0"], "users": ["test"], "verb": "rewritten"}] |
871 |/ |
938 |/ |
872 o ea207398892e |
939 o ea207398892e "" |
873 |
|
874 $ hg fatelogjson --hidden |
|
875 @ eb5a0daa2192 |
|
876 | |
|
877 | x b7ea6d14e664 |
|
878 | | |
|
879 | | x 0dec01379d3b |
|
880 | |/ |
|
881 | x 471f378eab4c |
|
882 |/ |
|
883 o ea207398892e |
|
884 |
940 |
885 |
941 |
886 Test template with pushed and pulled obs markers |
942 Test template with pushed and pulled obs markers |
887 ============================================== |
943 ============================================== |
888 |
944 |
964 o changeset: 0:ea207398892e |
1020 o changeset: 0:ea207398892e |
965 user: test |
1021 user: test |
966 date: Thu Jan 01 00:00:00 1970 +0000 |
1022 date: Thu Jan 01 00:00:00 1970 +0000 |
967 summary: ROOT |
1023 summary: ROOT |
968 |
1024 |
969 |
|
970 Check templates |
1025 Check templates |
971 --------------- |
1026 --------------- |
972 |
1027 |
973 $ hg tlog |
1028 $ hg tlog |
974 o 7a230b46bf61 |
1029 o 7a230b46bf61 |
975 | Precursors: 471f378eab4c |
1030 | Precursors: 471f378eab4c |
976 | semi-colon: 471f378eab4c |
1031 | semi-colon: 471f378eab4c |
977 | @ 471f378eab4c |
1032 | @ 471f378eab4c |
978 |/ Successors: [7a230b46bf61] |
1033 |/ Successors: [7a230b46bf61] |
979 | semi-colon: [7a230b46bf61] |
1034 | semi-colon: [7a230b46bf61] |
980 | Fate: superseed as 7a230b46bf61 |
1035 | Fate: rewritten by test as 7a230b46bf61 |
|
1036 | |
981 o ea207398892e |
1037 o ea207398892e |
982 |
1038 |
983 $ hg fatelog --hidden -v |
1039 $ hg fatelog --hidden -v |
984 o 7a230b46bf61 |
1040 o 7a230b46bf61 |
985 | |
1041 | |
986 | @ 471f378eab4c |
1042 | @ 471f378eab4c |
987 |/ |
1043 |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) |
|
1044 | |
988 o ea207398892e |
1045 o ea207398892e |
989 |
1046 |
990 $ hg up 'desc(A2)' |
1047 $ hg up 'desc(A2)' |
991 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1048 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
992 $ hg tlog |
1049 $ hg tlog |
1004 | Precursors: 471f378eab4c |
1061 | Precursors: 471f378eab4c |
1005 | semi-colon: 471f378eab4c |
1062 | semi-colon: 471f378eab4c |
1006 | x 471f378eab4c |
1063 | x 471f378eab4c |
1007 |/ Successors: [7a230b46bf61] |
1064 |/ Successors: [7a230b46bf61] |
1008 | semi-colon: [7a230b46bf61] |
1065 | semi-colon: [7a230b46bf61] |
1009 | Fate: superseed as 7a230b46bf61 |
1066 | Fate: rewritten by test as 7a230b46bf61 |
|
1067 | |
1010 o ea207398892e |
1068 o ea207398892e |
1011 |
1069 |
1012 $ hg fatelog --hidden -v |
1070 $ hg fatelog --hidden -v |
1013 @ 7a230b46bf61 |
1071 @ 7a230b46bf61 |
1014 | |
1072 | |
1015 | x 471f378eab4c |
1073 | x 471f378eab4c |
1016 |/ |
1074 |/ Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000) |
|
1075 | |
1017 o ea207398892e |
1076 o ea207398892e |
1018 |
1077 |
1019 |
1078 |
1020 $ hg fatelogjson --hidden |
1079 $ hg fatelogjson --hidden |
1021 @ 7a230b46bf61 |
1080 @ 7a230b46bf61 "" |
1022 | |
1081 | |
1023 | x 471f378eab4c |
1082 | x 471f378eab4c [{"markers": [["G\u001f7\udc8e\udcabL^%\udcf6\udcc7\u007fx['\udcc96\udcef\udcb2(t", ["\udcfd\udcf9\udcbd\udce5\u0012\udc9a(\udcd4T\udc8f\udcad\udcd3\udcf6+&\\\udcdd;z."], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["\udcfd\udcf9\udcbd\udce5\u0012\udc9a(\udcd4T\udc8f\udcad\udcd3\udcf6+&\\\udcdd;z.", ["z#\u000bF\udcbfa\udce5\u000b00\udc8cl\udcfd{\udcd1&\udc9e\udcf5G\u0002"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["z#\u000bF\udcbfa\udce5\u000b00\udc8cl\udcfd{\udcd1&\udc9e\udcf5G\u0002"], "users": ["test"], "verb": "rewritten"}] |
1024 |/ |
1083 |/ |
1025 o ea207398892e |
1084 o ea207398892e "" |
1026 |
1085 |
1027 |
1086 |
1028 Test templates with pruned commits |
1087 Test templates with pruned commits |
1029 ================================== |
1088 ================================== |
1030 |
1089 |