Show More
@@ -822,6 +822,7 b' def obsfateprinter(successors, markers, ' | |||
|
822 | 822 | # Date |
|
823 | 823 | dates = markersdates(markers) |
|
824 | 824 | |
|
825 | if verbose: | |
|
825 | 826 | min_date = min(dates) |
|
826 | 827 | max_date = max(dates) |
|
827 | 828 |
@@ -100,7 +100,7 b' Predecessors template should show curren' | |||
|
100 | 100 | o d004c8f274b9 |
|
101 | 101 | | |
|
102 | 102 | | @ 471f378eab4c |
|
103 |
|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
|
|
103 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | |
|
104 | 104 |
|
|
105 | 105 | |
|
106 | 106 | $ hg up 'desc(A1)' --hidden |
@@ -219,18 +219,18 b' Check other fatelog implementations' | |||
|
219 | 219 | @ d004c8f274b9 |
|
220 | 220 | | |
|
221 | 221 | | x a468dc9b3633 |
|
222 |
|/ Obsfate: rewritten using amend as 3:d004c8f274b9 |
|
|
222 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 | |
|
223 | 223 | | x 471f378eab4c |
|
224 |
|/ Obsfate: rewritten using amend as 2:a468dc9b3633 |
|
|
224 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 | |
|
225 | 225 | o ea207398892e |
|
226 | 226 | |
|
227 | 227 | $ hg fatelogkw --hidden |
|
228 | 228 | @ d004c8f274b9 |
|
229 | 229 | | |
|
230 | 230 | | x a468dc9b3633 |
|
231 |
|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 |
|
|
231 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 | |
|
232 | 232 | | x 471f378eab4c |
|
233 |
|/ Obsfate: rewritten using amend as 2:a468dc9b3633 |
|
|
233 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 | |
|
234 | 234 | o ea207398892e |
|
235 | 235 | |
|
236 | 236 | $ hg fatelogkw --hidden -v |
@@ -394,7 +394,7 b' Check other fatelog implementations' | |||
|
394 | 394 | o 337fec4d2edc |
|
395 | 395 | | |
|
396 | 396 | | x 471597cad322 |
|
397 |
|/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
|
397 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
|
398 | 398 |
|
|
399 | 399 | |
|
400 | 400 | $ hg fatelogkw --hidden |
@@ -403,7 +403,7 b' Check other fatelog implementations' | |||
|
403 | 403 | o 337fec4d2edc |
|
404 | 404 | | |
|
405 | 405 | | x 471597cad322 |
|
406 |
|/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
|
|
406 | |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | |
|
407 | 407 |
|
|
408 | 408 | |
|
409 | 409 | $ hg fatelogkw --hidden -v |
@@ -594,18 +594,18 b' Check other fatelog implementations' | |||
|
594 | 594 | @ eb5a0daa2192 |
|
595 | 595 | | |
|
596 | 596 | | x 0dec01379d3b |
|
597 |
| | Obsfate: rewritten as 3:eb5a0daa2192 |
|
|
597 | | | Obsfate: rewritten as 3:eb5a0daa2192 | |
|
598 | 598 |
|
|
599 |
|/ Obsfate: rewritten as 3:eb5a0daa2192 |
|
|
599 | |/ Obsfate: rewritten as 3:eb5a0daa2192 | |
|
600 | 600 |
|
|
601 | 601 | |
|
602 | 602 | $ hg fatelogkw --hidden |
|
603 | 603 | @ eb5a0daa2192 |
|
604 | 604 | | |
|
605 | 605 | | x 0dec01379d3b |
|
606 |
| | Obsfate: rewritten as 3:eb5a0daa2192 |
|
|
606 | | | Obsfate: rewritten as 3:eb5a0daa2192 | |
|
607 | 607 |
|
|
608 |
|/ Obsfate: rewritten as 3:eb5a0daa2192 |
|
|
608 | |/ Obsfate: rewritten as 3:eb5a0daa2192 | |
|
609 | 609 |
|
|
610 | 610 | |
|
611 | 611 | $ hg fatelogkw --hidden -v |
@@ -824,24 +824,24 b' Check other fatelog implementations' | |||
|
824 | 824 | o 019fadeab383 |
|
825 | 825 | | |
|
826 | 826 | | x 65b757b745b9 |
|
827 |
|/ Obsfate: rewritten using amend as 4:019fadeab383 |
|
|
827 | |/ Obsfate: rewritten using amend as 4:019fadeab383 | |
|
828 | 828 |
|
|
829 | 829 | |/ |
|
830 | 830 | | x 471f378eab4c |
|
831 |
|/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
|
832 |
|
|
|
831 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
|
832 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
|
833 | 833 |
|
|
834 | 834 | |
|
835 | 835 | $ hg fatelogkw --hidden |
|
836 | 836 | o 019fadeab383 |
|
837 | 837 | | |
|
838 | 838 | | x 65b757b745b9 |
|
839 |
|/ Obsfate: rewritten using amend as 4:019fadeab383 |
|
|
839 | |/ Obsfate: rewritten using amend as 4:019fadeab383 | |
|
840 | 840 |
|
|
841 | 841 | |/ |
|
842 | 842 | | x 471f378eab4c |
|
843 |
|/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
|
844 |
|
|
|
843 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
|
844 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
|
845 | 845 |
|
|
846 | 846 | |
|
847 | 847 | $ hg fatelogkw --hidden -v |
@@ -1095,22 +1095,22 b' Check other fatelog implementations' | |||
|
1095 | 1095 | @ eb5a0daa2192 |
|
1096 | 1096 | | |
|
1097 | 1097 | | x b7ea6d14e664 |
|
1098 |
| | Obsfate: rewritten as 4:eb5a0daa2192 |
|
|
1098 | | | Obsfate: rewritten as 4:eb5a0daa2192 | |
|
1099 | 1099 |
|
|
1100 |
| |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
|
1100 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 | |
|
1101 | 1101 |
|
|
1102 |
|/ Obsfate: rewritten as 4:eb5a0daa2192 |
|
|
1102 | |/ Obsfate: rewritten as 4:eb5a0daa2192 | |
|
1103 | 1103 |
|
|
1104 | 1104 | |
|
1105 | 1105 | $ hg fatelogkw --hidden |
|
1106 | 1106 | @ eb5a0daa2192 |
|
1107 | 1107 | | |
|
1108 | 1108 | | x b7ea6d14e664 |
|
1109 |
| | Obsfate: rewritten as 4:eb5a0daa2192 |
|
|
1109 | | | Obsfate: rewritten as 4:eb5a0daa2192 | |
|
1110 | 1110 |
|
|
1111 |
| |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 |
|
|
1111 | | |/ Obsfate: rewritten using amend as 3:b7ea6d14e664 | |
|
1112 | 1112 |
|
|
1113 |
|/ Obsfate: rewritten as 4:eb5a0daa2192 |
|
|
1113 | |/ Obsfate: rewritten as 4:eb5a0daa2192 | |
|
1114 | 1114 |
|
|
1115 | 1115 | |
|
1116 | 1116 | $ hg fatelogkw --hidden -v |
@@ -1282,14 +1282,14 b' Check other fatelog implementations' | |||
|
1282 | 1282 | @ 7a230b46bf61 |
|
1283 | 1283 | | |
|
1284 | 1284 | | x 471f378eab4c |
|
1285 |
|/ Obsfate: rewritten using amend as 2:7a230b46bf61 |
|
|
1285 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 | |
|
1286 | 1286 |
|
|
1287 | 1287 | |
|
1288 | 1288 | $ hg fatelogkw --hidden |
|
1289 | 1289 | @ 7a230b46bf61 |
|
1290 | 1290 | | |
|
1291 | 1291 | | x 471f378eab4c |
|
1292 |
|/ Obsfate: rewritten using amend as 2:7a230b46bf61 |
|
|
1292 | |/ Obsfate: rewritten using amend as 2:7a230b46bf61 | |
|
1293 | 1293 |
|
|
1294 | 1294 | |
|
1295 | 1295 | $ hg fatelogkw --hidden -v |
@@ -1445,20 +1445,20 b' Check other fatelog implementations' | |||
|
1445 | 1445 | o f897c6137566 |
|
1446 | 1446 | | |
|
1447 | 1447 | | x 0dec01379d3b |
|
1448 |
| | Obsfate: rewritten as 3:f897c6137566 |
|
|
1449 |
|
|
|
1448 | | | Obsfate: rewritten as 3:f897c6137566 | |
|
1449 | | | Obsfate: rewritten as 1:471f378eab4c | |
|
1450 | 1450 |
|
|
1451 |
|/ Obsfate: rewritten as 2:0dec01379d3b |
|
|
1451 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
|
1452 | 1452 |
|
|
1453 | 1453 | |
|
1454 | 1454 |
$ |
|
1455 | 1455 | o f897c6137566 |
|
1456 | 1456 | | |
|
1457 | 1457 | | x 0dec01379d3b |
|
1458 |
| | Obsfate: rewritten as 3:f897c6137566 |
|
|
1459 |
|
|
|
1458 | | | Obsfate: rewritten as 3:f897c6137566 | |
|
1459 | | | Obsfate: rewritten as 1:471f378eab4c | |
|
1460 | 1460 |
|
|
1461 |
|/ Obsfate: rewritten as 2:0dec01379d3b |
|
|
1461 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
|
1462 | 1462 |
|
|
1463 | 1463 | |
|
1464 | 1464 |
$ |
@@ -1832,21 +1832,21 b' Check other fatelog implementations' | |||
|
1832 | 1832 | o | b18bc8331526 |
|
1833 | 1833 | |/ |
|
1834 | 1834 | | x ba2ed02b0c9a |
|
1835 |
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
|
|
1835 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc | |
|
1836 | 1836 |
|
|
1837 |
|/ Obsfate: rewritten using amend as 8:b18bc8331526 |
|
|
1838 |
|
|
|
1837 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 | |
|
1838 | | Obsfate: rewritten using amend as 9:0b997eb7ceee | |
|
1839 | 1839 |
|
|
1840 | 1840 | | |
|
1841 | 1841 | | @ 9bd10a0775e4 |
|
1842 |
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
|
1842 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
|
1843 | 1843 |
|
|
1844 | 1844 | | |
|
1845 | 1845 | | x 0dec01379d3b |
|
1846 |
| | Obsfate: rewritten as 3:f897c6137566 |
|
|
1847 |
|
|
|
1846 | | | Obsfate: rewritten as 3:f897c6137566 | |
|
1847 | | | Obsfate: rewritten as 1:471f378eab4c | |
|
1848 | 1848 |
|
|
1849 |
|/ Obsfate: rewritten as 2:0dec01379d3b |
|
|
1849 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
|
1850 | 1850 |
|
|
1851 | 1851 | |
|
1852 | 1852 | $ hg fatelogkw --hidden |
@@ -1857,21 +1857,21 b' Check other fatelog implementations' | |||
|
1857 | 1857 | o | b18bc8331526 |
|
1858 | 1858 | |/ |
|
1859 | 1859 | | x ba2ed02b0c9a |
|
1860 |
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc |
|
|
1860 | | | Obsfate: rewritten using rebase as 10:eceed8f98ffc | |
|
1861 | 1861 |
|
|
1862 |
|/ Obsfate: rewritten using amend as 8:b18bc8331526 |
|
|
1863 |
|
|
|
1862 | |/ Obsfate: rewritten using amend as 8:b18bc8331526 | |
|
1863 | | Obsfate: rewritten using amend as 9:0b997eb7ceee | |
|
1864 | 1864 |
|
|
1865 | 1865 | | |
|
1866 | 1866 | | @ 9bd10a0775e4 |
|
1867 |
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
|
|
1867 | |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | |
|
1868 | 1868 |
|
|
1869 | 1869 | | |
|
1870 | 1870 | | x 0dec01379d3b |
|
1871 |
| | Obsfate: rewritten as 3:f897c6137566 |
|
|
1872 |
|
|
|
1871 | | | Obsfate: rewritten as 3:f897c6137566 | |
|
1872 | | | Obsfate: rewritten as 1:471f378eab4c | |
|
1873 | 1873 |
|
|
1874 |
|/ Obsfate: rewritten as 2:0dec01379d3b |
|
|
1874 | |/ Obsfate: rewritten as 2:0dec01379d3b | |
|
1875 | 1875 |
|
|
1876 | 1876 | |
|
1877 | 1877 | $ hg fatelogkw --hidden -v |
@@ -1977,22 +1977,22 b' Check other fatelog implementations' | |||
|
1977 | 1977 | |
|
1978 | 1978 | $ hg fatelogkw --hidden -q |
|
1979 | 1979 | x 65b757b745b9 |
|
1980 |
| Obsfate: pruned |
|
|
1980 | | Obsfate: pruned | |
|
1981 | 1981 |
|
|
1982 |
|/ Obsfate: pruned |
|
|
1982 | |/ Obsfate: pruned | |
|
1983 | 1983 |
|
|
1984 |
|/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
|
1985 |
|
|
|
1984 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
|
1985 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
|
1986 | 1986 |
|
|
1987 | 1987 | |
|
1988 | 1988 | $ hg fatelogkw --hidden |
|
1989 | 1989 | x 65b757b745b9 |
|
1990 |
| Obsfate: pruned |
|
|
1990 | | Obsfate: pruned | |
|
1991 | 1991 |
|
|
1992 |
|/ Obsfate: pruned |
|
|
1992 | |/ Obsfate: pruned | |
|
1993 | 1993 |
|
|
1994 |
|/ Obsfate: rewritten using amend as 2:fdf9bde5129a |
|
|
1995 |
|
|
|
1994 | |/ Obsfate: rewritten using amend as 2:fdf9bde5129a | |
|
1995 | | Obsfate: rewritten using amend as 3:65b757b745b9 | |
|
1996 | 1996 |
|
|
1997 | 1997 | |
|
1998 | 1998 | $ hg fatelogkw --hidden -v |
@@ -2101,20 +2101,20 b' Check other fatelog implementations' | |||
|
2101 | 2101 | |
|
2102 | 2102 | $ hg fatelogkw --hidden -q |
|
2103 | 2103 | @ 0d0ef4bdf70e |
|
2104 |
| Obsfate: pruned |
|
|
2104 | | Obsfate: pruned | |
|
2105 | 2105 |
|
|
2106 | 2106 | | |
|
2107 | 2107 | | x 471597cad322 |
|
2108 |
|/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
|
2108 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
|
2109 | 2109 |
|
|
2110 | 2110 | |
|
2111 | 2111 | $ hg fatelogkw --hidden |
|
2112 | 2112 | @ 0d0ef4bdf70e |
|
2113 |
| Obsfate: pruned |
|
|
2113 | | Obsfate: pruned | |
|
2114 | 2114 |
|
|
2115 | 2115 | | |
|
2116 | 2116 | | x 471597cad322 |
|
2117 |
|/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e |
|
|
2117 | |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | |
|
2118 | 2118 |
|
|
2119 | 2119 | |
|
2120 | 2120 | $ hg fatelogkw --hidden -v |
@@ -66,7 +66,7 b' A_1 have two direct and divergent succes' | |||
|
66 | 66 | | |
|
67 | 67 | | o 2:82623d38b9ba A_1 |
|
68 | 68 | |/ |
|
69 |
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba |
|
|
69 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
|
70 | 70 | |/ |
|
71 | 71 | @ 0:d20a80d4def3 base |
|
72 | 72 | |
@@ -127,11 +127,11 b' indirect divergence with known changeset' | |||
|
127 | 127 | $ hg log -G --hidden |
|
128 | 128 | @ 4:01f36c5a8fda A_3 |
|
129 | 129 | | |
|
130 |
| x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda |
|
|
130 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
|
131 | 131 | |/ |
|
132 | 132 | | o 2:82623d38b9ba A_1 |
|
133 | 133 | |/ |
|
134 |
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba |
|
|
134 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
|
135 | 135 | |/ |
|
136 | 136 | o 0:d20a80d4def3 base |
|
137 | 137 | |
@@ -185,7 +185,7 b' indirect divergence with known changeset' | |||
|
185 | 185 | | |
|
186 | 186 | | o 2:82623d38b9ba A_1 |
|
187 | 187 | |/ |
|
188 |
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba |
|
|
188 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
|
189 | 189 | |/ |
|
190 | 190 | @ 0:d20a80d4def3 base |
|
191 | 191 | |
@@ -259,11 +259,11 b' divergence that converge again is not di' | |||
|
259 | 259 | $ hg log -G --hidden |
|
260 | 260 | @ 4:01f36c5a8fda A_3 |
|
261 | 261 | | |
|
262 |
| x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda |
|
|
262 | | x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda] | |
|
263 | 263 | |/ |
|
264 |
| x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda |
|
|
264 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
|
265 | 265 | |/ |
|
266 |
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba |
|
|
266 | | x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da] | |
|
267 | 267 | |/ |
|
268 | 268 | o 0:d20a80d4def3 base |
|
269 | 269 | |
@@ -309,7 +309,7 b' split is not divergences' | |||
|
309 | 309 | | |
|
310 | 310 | | o 2:82623d38b9ba A_1 |
|
311 | 311 | |/ |
|
312 |
| x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da |
|
|
312 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
|
313 | 313 | |/ |
|
314 | 314 | @ 0:d20a80d4def3 base |
|
315 | 315 | |
@@ -361,15 +361,15 b' Even when subsequent rewriting happen' | |||
|
361 | 361 | $ hg log -G --hidden |
|
362 | 362 | @ 6:e442cfc57690 A_5 |
|
363 | 363 | | |
|
364 |
| x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 |
|
|
364 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
|
365 | 365 | |/ |
|
366 | 366 | | o 4:01f36c5a8fda A_3 |
|
367 | 367 | |/ |
|
368 |
| x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a |
|
|
368 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
|
369 | 369 | |/ |
|
370 |
| x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda |
|
|
370 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
|
371 | 371 | |/ |
|
372 |
| x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da |
|
|
372 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
|
373 | 373 | |/ |
|
374 | 374 | o 0:d20a80d4def3 base |
|
375 | 375 | |
@@ -437,19 +437,19 b' Check more complex obsolescence graft (w' | |||
|
437 | 437 | |/ |
|
438 | 438 | | o 8:7ae126973a96 A_7 |
|
439 | 439 | |/ |
|
440 |
| x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da |
|
|
440 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
|
441 | 441 | | | |
|
442 |
| x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a |
|
|
442 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | |
|
443 | 443 | |/ |
|
444 |
| x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 |
|
|
444 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
|
445 | 445 | |/ |
|
446 | 446 | | o 4:01f36c5a8fda A_3 |
|
447 | 447 | |/ |
|
448 |
| x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a |
|
|
448 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
|
449 | 449 | |/ |
|
450 |
| x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda |
|
|
450 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
|
451 | 451 | |/ |
|
452 |
| x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da |
|
|
452 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
|
453 | 453 | |/ |
|
454 | 454 | @ 0:d20a80d4def3 base |
|
455 | 455 | |
@@ -535,25 +535,25 b' fix the divergence' | |||
|
535 | 535 | $ hg log -G --hidden |
|
536 | 536 | o 11:a139f71be9da A_A |
|
537 | 537 | | |
|
538 |
| x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da |
|
|
538 | | x 10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da] | |
|
539 | 539 | |/ |
|
540 |
| x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da |
|
|
540 | | x 9:14608b260df8 A_8 [rewritten as 11:a139f71be9da] | |
|
541 | 541 | |/ |
|
542 |
| x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da |
|
|
542 | | x 8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da] | |
|
543 | 543 | |/ |
|
544 |
| x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da |
|
|
544 | | x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da] | |
|
545 | 545 | | | |
|
546 |
| x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a |
|
|
546 | | x 6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8] | |
|
547 | 547 | |/ |
|
548 |
| x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690 |
|
|
548 | | x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690] | |
|
549 | 549 | |/ |
|
550 | 550 | | o 4:01f36c5a8fda A_3 |
|
551 | 551 | |/ |
|
552 |
| x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a |
|
|
552 | | x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a] | |
|
553 | 553 | |/ |
|
554 |
| x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda |
|
|
554 | | x 2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda] | |
|
555 | 555 | |/ |
|
556 |
| x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da |
|
|
556 | | x 1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da] | |
|
557 | 557 | |/ |
|
558 | 558 | @ 0:d20a80d4def3 base |
|
559 | 559 |
@@ -159,9 +159,9 b' check that heads does not report them' | |||
|
159 | 159 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
160 | 160 | $ hg heads --hidden |
|
161 | 161 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
162 |
4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 |
|
|
163 |
3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 |
|
|
164 |
2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163 |
|
|
162 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
|
163 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
|
164 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163] | |
|
165 | 165 | |
|
166 | 166 | |
|
167 | 167 | check that summary does not report them |
@@ -277,11 +277,11 b' Basic exclusive testing' | |||
|
277 | 277 | $ hg log -G --hidden |
|
278 | 278 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
279 | 279 | | |
|
280 |
| x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072 |
|
|
280 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] | |
|
281 | 281 | |/ |
|
282 |
| x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 |
|
|
282 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
|
283 | 283 | |/ |
|
284 |
| x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 |
|
|
284 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
|
285 | 285 | |/ |
|
286 | 286 | | o 2:245bde4270cd (public) [ ] add original_c |
|
287 | 287 | |/ |
@@ -435,11 +435,11 b' clone support' | |||
|
435 | 435 | $ hg -R clone-dest log -G --hidden |
|
436 | 436 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
437 | 437 | | |
|
438 |
| x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072 |
|
|
438 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] | |
|
439 | 439 | |/ |
|
440 |
| x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350 |
|
|
440 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] | |
|
441 | 441 | |/ |
|
442 |
| x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9 |
|
|
442 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] | |
|
443 | 443 | |/ |
|
444 | 444 | | o 2:245bde4270cd (public) [ ] add original_c |
|
445 | 445 | |/ |
@@ -520,7 +520,7 b' detect outgoing obsolete and unstable' | |||
|
520 | 520 | $ hg debugobsolete | grep `getid original_d` |
|
521 | 521 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
522 | 522 | $ hg log -r 'obsolete()' |
|
523 |
4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned |
|
|
523 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
|
524 | 524 | $ hg summary |
|
525 | 525 | parent: 5:cda648ca50f5 tip (orphan) |
|
526 | 526 | add original_e |
@@ -532,7 +532,7 b' detect outgoing obsolete and unstable' | |||
|
532 | 532 | $ hg log -G -r '::orphan()' |
|
533 | 533 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
534 | 534 | | |
|
535 |
x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned |
|
|
535 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
|
536 | 536 | | |
|
537 | 537 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
538 | 538 | | |
@@ -571,7 +571,7 b" Don't try to push extinct changeset" | |||
|
571 | 571 | 1:7c3bad9141dc (public) [ ] add b |
|
572 | 572 | 2:245bde4270cd (public) [ ] add original_c |
|
573 | 573 | 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
574 |
4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned |
|
|
574 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
|
575 | 575 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
576 | 576 | $ hg push ../tmpf -f # -f because be push unstable too |
|
577 | 577 | pushing to ../tmpf |
@@ -595,7 +595,7 b' Do not warn about new head when the new ' | |||
|
595 | 595 | $ hg log -G |
|
596 | 596 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
597 | 597 | | |
|
598 |
x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned |
|
|
598 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
|
599 | 599 | | |
|
600 | 600 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
601 | 601 | | |
@@ -636,9 +636,9 b' Reminder of the repo situation' | |||
|
636 | 636 | $ hg log --hidden --graph |
|
637 | 637 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
638 | 638 | | |
|
639 |
| x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net> |
|
|
639 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>] | |
|
640 | 640 | | | |
|
641 |
| x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned |
|
|
641 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] | |
|
642 | 642 | |/ |
|
643 | 643 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
644 | 644 | | |
@@ -928,7 +928,7 b' Several troubles on the same changeset (' | |||
|
928 | 928 | test the "obsolete" templatekw |
|
929 | 929 | |
|
930 | 930 | $ hg log -r 'obsolete()' |
|
931 |
6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned |
|
|
931 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] | |
|
932 | 932 | |
|
933 | 933 | test the "troubles" templatekw |
|
934 | 934 | |
@@ -1098,7 +1098,7 b' Test that a local tag blocks a changeset' | |||
|
1098 | 1098 | $ hg log -G |
|
1099 | 1099 | @ 2:323a9c3ddd91 (draft) [tip ] A |
|
1100 | 1100 | | |
|
1101 |
| x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91 |
|
|
1101 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91] | |
|
1102 | 1102 | |/ |
|
1103 | 1103 | o 0:d20a80d4def3 (draft) [ ] base |
|
1104 | 1104 | |
@@ -1152,7 +1152,7 b' Test bundle overlay onto hidden revision' | |||
|
1152 | 1152 | $ hg log -G --hidden |
|
1153 | 1153 | @ 2:b7d587542d40 (draft) [tip ] B+ |
|
1154 | 1154 | | |
|
1155 |
| x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40 |
|
|
1155 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] | |
|
1156 | 1156 | |/ |
|
1157 | 1157 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1158 | 1158 | |
@@ -1279,7 +1279,7 b' bookmarks change' | |||
|
1279 | 1279 | $ hg commit --amend -m "message" |
|
1280 | 1280 | $ hg book bookb -r 13bedc178fce --hidden |
|
1281 | 1281 | $ hg log -r 13bedc178fce |
|
1282 |
4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753 |
|
|
1282 | 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] | |
|
1283 | 1283 | $ hg book -d bookb |
|
1284 | 1284 | $ hg log -r 13bedc178fce |
|
1285 | 1285 | abort: hidden revision '13bedc178fce'! |
@@ -1319,7 +1319,7 b' Test ability to pull changeset with loca' | |||
|
1319 | 1319 | $ hg log -G --hidden |
|
1320 | 1320 | @ 3:b0551702f918 (draft) [tip ] 2 |
|
1321 | 1321 | | |
|
1322 |
| x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918 |
|
|
1322 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918] | |
|
1323 | 1323 | |/ |
|
1324 | 1324 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1325 | 1325 | | |
General Comments 0
You need to be logged in to leave comments.
Login now