Show More
@@ -29,6 +29,7 b' Global setup' | |||||
29 | > {if(successorssets, "\n json: {successorssets|json}")}\n' |
|
29 | > {if(successorssets, "\n json: {successorssets|json}")}\n' | |
30 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' |
|
30 | > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}' | |
31 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' |
|
31 | > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, " Obsfate: {succsandmarkers|json}\n")}' | |
|
32 | > fatelogkw = log -G -T '{node|short}\n{if(obsfate, "{obsfate % " Obsfate: {fate}\n"}")}' | |||
32 | > EOF |
|
33 | > EOF | |
33 |
|
34 | |||
34 | Test templates on amended commit |
|
35 | Test templates on amended commit | |
@@ -94,6 +95,14 b' Predecessors template should show curren' | |||||
94 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
|
95 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); | |
95 | o ea207398892e |
|
96 | o ea207398892e | |
96 |
|
97 | |||
|
98 | ||||
|
99 | $ hg fatelogkw | |||
|
100 | o d004c8f274b9 | |||
|
101 | | | |||
|
102 | | @ 471f378eab4c | |||
|
103 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) | |||
|
104 | o ea207398892e | |||
|
105 | ||||
97 | $ hg up 'desc(A1)' --hidden |
|
106 | $ hg up 'desc(A1)' --hidden | |
98 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
107 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
99 |
|
108 | |||
@@ -202,6 +211,37 b' visible.' | |||||
202 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
|
211 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] | |
203 | o ea207398892e |
|
212 | o ea207398892e | |
204 |
|
213 | |||
|
214 | ||||
|
215 | Check other fatelog implementations | |||
|
216 | ----------------------------------- | |||
|
217 | ||||
|
218 | $ hg fatelogkw --hidden -q | |||
|
219 | @ d004c8f274b9 | |||
|
220 | | | |||
|
221 | | x a468dc9b3633 | |||
|
222 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |||
|
223 | | x 471f378eab4c | |||
|
224 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |||
|
225 | o ea207398892e | |||
|
226 | ||||
|
227 | $ hg fatelogkw --hidden | |||
|
228 | @ d004c8f274b9 | |||
|
229 | | | |||
|
230 | | x a468dc9b3633 | |||
|
231 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |||
|
232 | | x 471f378eab4c | |||
|
233 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |||
|
234 | o ea207398892e | |||
|
235 | ||||
|
236 | $ hg fatelogkw --hidden -v | |||
|
237 | @ d004c8f274b9 | |||
|
238 | | | |||
|
239 | | x a468dc9b3633 | |||
|
240 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | |||
|
241 | | x 471f378eab4c | |||
|
242 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | |||
|
243 | o ea207398892e | |||
|
244 | ||||
205 | Test templates with splitted commit |
|
245 | Test templates with splitted commit | |
206 | =================================== |
|
246 | =================================== | |
207 |
|
247 | |||
@@ -345,6 +385,37 b' with --hidden' | |||||
345 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] |
|
385 | |/ Obsfate: [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"]}] | |
346 | o ea207398892e |
|
386 | o ea207398892e | |
347 |
|
387 | |||
|
388 | Check other fatelog implementations | |||
|
389 | ----------------------------------- | |||
|
390 | ||||
|
391 | $ hg fatelogkw --hidden -q | |||
|
392 | @ f257fde29c7a | |||
|
393 | | | |||
|
394 | o 337fec4d2edc | |||
|
395 | | | |||
|
396 | | x 471597cad322 | |||
|
397 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) | |||
|
398 | o ea207398892e | |||
|
399 | ||||
|
400 | $ hg fatelogkw --hidden | |||
|
401 | @ f257fde29c7a | |||
|
402 | | | |||
|
403 | o 337fec4d2edc | |||
|
404 | | | |||
|
405 | | x 471597cad322 | |||
|
406 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) | |||
|
407 | o ea207398892e | |||
|
408 | ||||
|
409 | $ hg fatelogkw --hidden -v | |||
|
410 | @ f257fde29c7a | |||
|
411 | | | |||
|
412 | o 337fec4d2edc | |||
|
413 | | | |||
|
414 | | x 471597cad322 | |||
|
415 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a by test (at 1970-01-01 00:00 +0000) | |||
|
416 | o ea207398892e | |||
|
417 | ||||
|
418 | ||||
348 | Test templates with folded commit |
|
419 | Test templates with folded commit | |
349 | ================================= |
|
420 | ================================= | |
350 |
|
421 | |||
@@ -516,6 +587,36 b' with --hidden' | |||||
516 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] |
|
587 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]}] | |
517 | o ea207398892e |
|
588 | o ea207398892e | |
518 |
|
589 | |||
|
590 | Check other fatelog implementations | |||
|
591 | ----------------------------------- | |||
|
592 | ||||
|
593 | $ hg fatelogkw --hidden -q | |||
|
594 | @ eb5a0daa2192 | |||
|
595 | | | |||
|
596 | | x 0dec01379d3b | |||
|
597 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
598 | | x 471f378eab4c | |||
|
599 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
600 | o ea207398892e | |||
|
601 | ||||
|
602 | $ hg fatelogkw --hidden | |||
|
603 | @ eb5a0daa2192 | |||
|
604 | | | |||
|
605 | | x 0dec01379d3b | |||
|
606 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
607 | | x 471f378eab4c | |||
|
608 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
609 | o ea207398892e | |||
|
610 | ||||
|
611 | $ hg fatelogkw --hidden -v | |||
|
612 | @ eb5a0daa2192 | |||
|
613 | | | |||
|
614 | | x 0dec01379d3b | |||
|
615 | | | Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
616 | | x 471f378eab4c | |||
|
617 | |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
618 | o ea207398892e | |||
|
619 | ||||
519 |
|
620 | |||
520 | Test templates with divergence |
|
621 | Test templates with divergence | |
521 | ============================== |
|
622 | ============================== | |
@@ -716,6 +817,46 b' Predecessors template should the predece' | |||||
716 | o ea207398892e |
|
817 | o ea207398892e | |
717 |
|
818 | |||
718 |
|
819 | |||
|
820 | Check other fatelog implementations | |||
|
821 | ----------------------------------- | |||
|
822 | ||||
|
823 | $ hg fatelogkw --hidden -q | |||
|
824 | o 019fadeab383 | |||
|
825 | | | |||
|
826 | | x 65b757b745b9 | |||
|
827 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) | |||
|
828 | | @ fdf9bde5129a | |||
|
829 | |/ | |||
|
830 | | x 471f378eab4c | |||
|
831 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |||
|
832 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |||
|
833 | o ea207398892e | |||
|
834 | ||||
|
835 | $ hg fatelogkw --hidden | |||
|
836 | o 019fadeab383 | |||
|
837 | | | |||
|
838 | | x 65b757b745b9 | |||
|
839 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) | |||
|
840 | | @ fdf9bde5129a | |||
|
841 | |/ | |||
|
842 | | x 471f378eab4c | |||
|
843 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |||
|
844 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |||
|
845 | o ea207398892e | |||
|
846 | ||||
|
847 | $ hg fatelogkw --hidden -v | |||
|
848 | o 019fadeab383 | |||
|
849 | | | |||
|
850 | | x 65b757b745b9 | |||
|
851 | |/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000) | |||
|
852 | | @ fdf9bde5129a | |||
|
853 | |/ | |||
|
854 | | x 471f378eab4c | |||
|
855 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |||
|
856 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |||
|
857 | o ea207398892e | |||
|
858 | ||||
|
859 | ||||
719 | Test templates with amended + folded commit |
|
860 | Test templates with amended + folded commit | |
720 | =========================================== |
|
861 | =========================================== | |
721 |
|
862 | |||
@@ -947,6 +1088,43 b' with --hidden' | |||||
947 | o ea207398892e |
|
1088 | o ea207398892e | |
948 |
|
1089 | |||
949 |
|
1090 | |||
|
1091 | Check other fatelog implementations | |||
|
1092 | ----------------------------------- | |||
|
1093 | ||||
|
1094 | $ hg fatelogkw --hidden -q | |||
|
1095 | @ eb5a0daa2192 | |||
|
1096 | | | |||
|
1097 | | x b7ea6d14e664 | |||
|
1098 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
1099 | | | x 0dec01379d3b | |||
|
1100 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) | |||
|
1101 | | x 471f378eab4c | |||
|
1102 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
1103 | o ea207398892e | |||
|
1104 | ||||
|
1105 | $ hg fatelogkw --hidden | |||
|
1106 | @ eb5a0daa2192 | |||
|
1107 | | | |||
|
1108 | | x b7ea6d14e664 | |||
|
1109 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
1110 | | | x 0dec01379d3b | |||
|
1111 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) | |||
|
1112 | | x 471f378eab4c | |||
|
1113 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
1114 | o ea207398892e | |||
|
1115 | ||||
|
1116 | $ hg fatelogkw --hidden -v | |||
|
1117 | @ eb5a0daa2192 | |||
|
1118 | | | |||
|
1119 | | x b7ea6d14e664 | |||
|
1120 | | | Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
1121 | | | x 0dec01379d3b | |||
|
1122 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 by test (at 1970-01-01 00:00 +0000) | |||
|
1123 | | x 471f378eab4c | |||
|
1124 | |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000) | |||
|
1125 | o ea207398892e | |||
|
1126 | ||||
|
1127 | ||||
950 | Test template with pushed and pulled obs markers |
|
1128 | Test template with pushed and pulled obs markers | |
951 | ================================================ |
|
1129 | ================================================ | |
952 |
|
1130 | |||
@@ -1097,6 +1275,31 b' with --hidden' | |||||
1097 | o ea207398892e |
|
1275 | o ea207398892e | |
1098 |
|
1276 | |||
1099 |
|
1277 | |||
|
1278 | Check other fatelog implementations | |||
|
1279 | ----------------------------------- | |||
|
1280 | ||||
|
1281 | $ hg fatelogkw --hidden -q | |||
|
1282 | @ 7a230b46bf61 | |||
|
1283 | | | |||
|
1284 | | x 471f378eab4c | |||
|
1285 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | |||
|
1286 | o ea207398892e | |||
|
1287 | ||||
|
1288 | $ hg fatelogkw --hidden | |||
|
1289 | @ 7a230b46bf61 | |||
|
1290 | | | |||
|
1291 | | x 471f378eab4c | |||
|
1292 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | |||
|
1293 | o ea207398892e | |||
|
1294 | ||||
|
1295 | $ hg fatelogkw --hidden -v | |||
|
1296 | @ 7a230b46bf61 | |||
|
1297 | | | |||
|
1298 | | x 471f378eab4c | |||
|
1299 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) | |||
|
1300 | o ea207398892e | |||
|
1301 | ||||
|
1302 | ||||
1100 | Test template with obsmarkers cycle |
|
1303 | Test template with obsmarkers cycle | |
1101 | =================================== |
|
1304 | =================================== | |
1102 |
|
1305 | |||
@@ -1234,6 +1437,41 b' Check templates' | |||||
1234 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] |
|
1437 | | json: [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]] | |
1235 | @ ea207398892e |
|
1438 | @ ea207398892e | |
1236 |
|
1439 | |||
|
1440 | ||||
|
1441 | Check other fatelog implementations | |||
|
1442 | ----------------------------------- | |||
|
1443 | ||||
|
1444 | $ hg fatelogkw --hidden -q | |||
|
1445 | o f897c6137566 | |||
|
1446 | | | |||
|
1447 | | x 0dec01379d3b | |||
|
1448 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |||
|
1449 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |||
|
1450 | | x 471f378eab4c | |||
|
1451 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |||
|
1452 | @ ea207398892e | |||
|
1453 | ||||
|
1454 | $ hg fatelogkw --hidden | |||
|
1455 | o f897c6137566 | |||
|
1456 | | | |||
|
1457 | | x 0dec01379d3b | |||
|
1458 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |||
|
1459 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |||
|
1460 | | x 471f378eab4c | |||
|
1461 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |||
|
1462 | @ ea207398892e | |||
|
1463 | ||||
|
1464 | $ hg fatelogkw --hidden -v | |||
|
1465 | o f897c6137566 | |||
|
1466 | | | |||
|
1467 | | x 0dec01379d3b | |||
|
1468 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |||
|
1469 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |||
|
1470 | | x 471f378eab4c | |||
|
1471 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |||
|
1472 | @ ea207398892e | |||
|
1473 | ||||
|
1474 | ||||
1237 | Test template with split + divergence with cycles |
|
1475 | Test template with split + divergence with cycles | |
1238 | ================================================= |
|
1476 | ================================================= | |
1239 |
|
1477 | |||
@@ -1583,6 +1821,84 b' Check templates' | |||||
1583 | | |
|
1821 | | | |
1584 | o ea207398892e |
|
1822 | o ea207398892e | |
1585 |
|
1823 | |||
|
1824 | Check other fatelog implementations | |||
|
1825 | ----------------------------------- | |||
|
1826 | ||||
|
1827 | $ hg fatelogkw --hidden -q | |||
|
1828 | o eceed8f98ffc | |||
|
1829 | | | |||
|
1830 | | o 0b997eb7ceee | |||
|
1831 | | | | |||
|
1832 | o | b18bc8331526 | |||
|
1833 | |/ | |||
|
1834 | | x ba2ed02b0c9a | |||
|
1835 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) | |||
|
1836 | | x 4a004186e638 | |||
|
1837 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) | |||
|
1838 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) | |||
|
1839 | o dd800401bd8c | |||
|
1840 | | | |||
|
1841 | | @ 9bd10a0775e4 | |||
|
1842 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) | |||
|
1843 | o f897c6137566 | |||
|
1844 | | | |||
|
1845 | | x 0dec01379d3b | |||
|
1846 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |||
|
1847 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |||
|
1848 | | x 471f378eab4c | |||
|
1849 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |||
|
1850 | o ea207398892e | |||
|
1851 | ||||
|
1852 | $ hg fatelogkw --hidden | |||
|
1853 | o eceed8f98ffc | |||
|
1854 | | | |||
|
1855 | | o 0b997eb7ceee | |||
|
1856 | | | | |||
|
1857 | o | b18bc8331526 | |||
|
1858 | |/ | |||
|
1859 | | x ba2ed02b0c9a | |||
|
1860 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) | |||
|
1861 | | x 4a004186e638 | |||
|
1862 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) | |||
|
1863 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) | |||
|
1864 | o dd800401bd8c | |||
|
1865 | | | |||
|
1866 | | @ 9bd10a0775e4 | |||
|
1867 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) | |||
|
1868 | o f897c6137566 | |||
|
1869 | | | |||
|
1870 | | x 0dec01379d3b | |||
|
1871 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |||
|
1872 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |||
|
1873 | | x 471f378eab4c | |||
|
1874 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |||
|
1875 | o ea207398892e | |||
|
1876 | ||||
|
1877 | $ hg fatelogkw --hidden -v | |||
|
1878 | o eceed8f98ffc | |||
|
1879 | | | |||
|
1880 | | o 0b997eb7ceee | |||
|
1881 | | | | |||
|
1882 | o | b18bc8331526 | |||
|
1883 | |/ | |||
|
1884 | | x ba2ed02b0c9a | |||
|
1885 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000) | |||
|
1886 | | x 4a004186e638 | |||
|
1887 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000) | |||
|
1888 | | Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000) | |||
|
1889 | o dd800401bd8c | |||
|
1890 | | | |||
|
1891 | | @ 9bd10a0775e4 | |||
|
1892 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000) | |||
|
1893 | o f897c6137566 | |||
|
1894 | | | |||
|
1895 | | x 0dec01379d3b | |||
|
1896 | | | Obsfate: rewritten as 3:f897c6137566 by test (at 1970-01-01 00:00 +0000) | |||
|
1897 | | | Obsfate: rewritten as 1:471f378eab4c by test (at 1970-01-01 00:00 +0000) | |||
|
1898 | | x 471f378eab4c | |||
|
1899 | |/ Obsfate: rewritten as 2:0dec01379d3b by test (at 1970-01-01 00:00 +0000) | |||
|
1900 | o ea207398892e | |||
|
1901 | ||||
1586 | Test templates with pruned commits |
|
1902 | Test templates with pruned commits | |
1587 | ================================== |
|
1903 | ================================== | |
1588 |
|
1904 | |||
@@ -1656,6 +1972,39 b' Check output' | |||||
1656 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); |
|
1972 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000); | |
1657 | o ea207398892e |
|
1973 | o ea207398892e | |
1658 |
|
1974 | |||
|
1975 | Check other fatelog implementations | |||
|
1976 | ----------------------------------- | |||
|
1977 | ||||
|
1978 | $ hg fatelogkw --hidden -q | |||
|
1979 | x 65b757b745b9 | |||
|
1980 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
1981 | | x fdf9bde5129a | |||
|
1982 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
1983 | | @ 471f378eab4c | |||
|
1984 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |||
|
1985 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |||
|
1986 | o ea207398892e | |||
|
1987 | ||||
|
1988 | $ hg fatelogkw --hidden | |||
|
1989 | x 65b757b745b9 | |||
|
1990 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
1991 | | x fdf9bde5129a | |||
|
1992 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
1993 | | @ 471f378eab4c | |||
|
1994 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |||
|
1995 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |||
|
1996 | o ea207398892e | |||
|
1997 | ||||
|
1998 | $ hg fatelogkw --hidden -v | |||
|
1999 | x 65b757b745b9 | |||
|
2000 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
2001 | | x fdf9bde5129a | |||
|
2002 | |/ Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
2003 | | @ 471f378eab4c | |||
|
2004 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000) | |||
|
2005 | | Obsfate: rewritten using amend as 3:65b757b745b9 by test (at 1970-01-01 00:00 +0000) | |||
|
2006 | o ea207398892e | |||
|
2007 | ||||
1659 |
|
2008 | |||
1660 | Test templates with splitted and pruned commit |
|
2009 | Test templates with splitted and pruned commit | |
1661 | ============================================== |
|
2010 | ============================================== | |
@@ -1746,3 +2095,34 b' Check templates' | |||||
1746 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); |
|
2095 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000); | |
1747 | o ea207398892e |
|
2096 | o ea207398892e | |
1748 |
|
2097 | |||
|
2098 | ||||
|
2099 | Check other fatelog implementations | |||
|
2100 | ----------------------------------- | |||
|
2101 | ||||
|
2102 | $ hg fatelogkw --hidden -q | |||
|
2103 | @ 0d0ef4bdf70e | |||
|
2104 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
2105 | o 617adc3a144c | |||
|
2106 | | | |||
|
2107 | | x 471597cad322 | |||
|
2108 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) | |||
|
2109 | o ea207398892e | |||
|
2110 | ||||
|
2111 | $ hg fatelogkw --hidden | |||
|
2112 | @ 0d0ef4bdf70e | |||
|
2113 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
2114 | o 617adc3a144c | |||
|
2115 | | | |||
|
2116 | | x 471597cad322 | |||
|
2117 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) | |||
|
2118 | o ea207398892e | |||
|
2119 | ||||
|
2120 | $ hg fatelogkw --hidden -v | |||
|
2121 | @ 0d0ef4bdf70e | |||
|
2122 | | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) | |||
|
2123 | o 617adc3a144c | |||
|
2124 | | | |||
|
2125 | | x 471597cad322 | |||
|
2126 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) | |||
|
2127 | o ea207398892e | |||
|
2128 |
General Comments 0
You need to be logged in to leave comments.
Login now