equal
deleted
inserted
replaced
39 | summary: A1 |
39 | summary: A1 |
40 | |
40 | |
41 | x changeset: 2:f137d23bb3e1 |
41 | x changeset: 2:f137d23bb3e1 |
42 | | user: test |
42 | | user: test |
43 | | date: Thu Jan 01 00:00:00 1970 +0000 |
43 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
44 | | obsolete: pruned |
44 | | summary: temporary amend commit for 471f378eab4c |
45 | | summary: temporary amend commit for 471f378eab4c |
45 | | |
46 | | |
46 | x changeset: 1:471f378eab4c |
47 | x changeset: 1:471f378eab4c |
47 |/ user: test |
48 |/ user: test |
48 | date: Thu Jan 01 00:00:00 1970 +0000 |
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
50 | obsolete: rewritten as 4ae3a4151de9 |
49 | summary: A0 |
51 | summary: A0 |
50 | |
52 | |
51 o changeset: 0:ea207398892e |
53 o changeset: 0:ea207398892e |
52 user: test |
54 user: test |
53 date: Thu Jan 01 00:00:00 1970 +0000 |
55 date: Thu Jan 01 00:00:00 1970 +0000 |
57 ----------- |
59 ----------- |
58 $ hg obslog --patch 4ae3a4151de9 |
60 $ hg obslog --patch 4ae3a4151de9 |
59 @ 4ae3a4151de9 (3) A1 |
61 @ 4ae3a4151de9 (3) A1 |
60 | |
62 | |
61 x 471f378eab4c (1) A0 |
63 x 471f378eab4c (1) A0 |
62 rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) |
64 rewritten(description, content) by test (Thu Jan 01 00:00:00 1970 +0000) as 4ae3a4151de9 |
63 --- a/471f378eab4c-changeset-description |
65 --- a/471f378eab4c-changeset-description |
64 +++ b/4ae3a4151de9-changeset-description |
66 +++ b/4ae3a4151de9-changeset-description |
65 @@ -1,1 +1,3 @@ |
67 @@ -1,1 +1,3 @@ |
66 -A0 |
68 -A0 |
67 +A1 |
69 +A1 |
195 $ hg log --hidden -G |
197 $ hg log --hidden -G |
196 x changeset: 2:0dec01379d3b |
198 x changeset: 2:0dec01379d3b |
197 | tag: tip |
199 | tag: tip |
198 | user: test |
200 | user: test |
199 | date: Thu Jan 01 00:00:00 1970 +0000 |
201 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
202 | obsolete: pruned |
200 | summary: B0 |
203 | summary: B0 |
201 | |
204 | |
202 @ changeset: 1:471f378eab4c |
205 @ changeset: 1:471f378eab4c |
203 | user: test |
206 | user: test |
204 | date: Thu Jan 01 00:00:00 1970 +0000 |
207 | date: Thu Jan 01 00:00:00 1970 +0000 |
334 | summary: A0 |
337 | summary: A0 |
335 | |
338 | |
336 | x changeset: 1:471597cad322 |
339 | x changeset: 1:471597cad322 |
337 |/ user: test |
340 |/ user: test |
338 | date: Thu Jan 01 00:00:00 1970 +0000 |
341 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
342 | obsolete: split as 337fec4d2edc, f257fde29c7a |
339 | summary: A0 |
343 | summary: A0 |
340 | |
344 | |
341 o changeset: 0:ea207398892e |
345 o changeset: 0:ea207398892e |
342 user: test |
346 user: test |
343 date: Thu Jan 01 00:00:00 1970 +0000 |
347 date: Thu Jan 01 00:00:00 1970 +0000 |
587 | summary: A0 |
591 | summary: A0 |
588 | |
592 | |
589 | x changeset: 1:de7290d8b885 |
593 | x changeset: 1:de7290d8b885 |
590 |/ user: test |
594 |/ user: test |
591 | date: Thu Jan 01 00:00:00 1970 +0000 |
595 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
596 | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a |
592 | summary: A0 |
597 | summary: A0 |
593 | |
598 | |
594 o changeset: 0:ea207398892e |
599 o changeset: 0:ea207398892e |
595 user: test |
600 user: test |
596 date: Thu Jan 01 00:00:00 1970 +0000 |
601 date: Thu Jan 01 00:00:00 1970 +0000 |
762 | summary: C0 |
767 | summary: C0 |
763 | |
768 | |
764 | x changeset: 2:0dec01379d3b |
769 | x changeset: 2:0dec01379d3b |
765 | | user: test |
770 | | user: test |
766 | | date: Thu Jan 01 00:00:00 1970 +0000 |
771 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
772 | | obsolete: rewritten as eb5a0daa2192 |
767 | | summary: B0 |
773 | | summary: B0 |
768 | | |
774 | | |
769 | x changeset: 1:471f378eab4c |
775 | x changeset: 1:471f378eab4c |
770 |/ user: test |
776 |/ user: test |
771 | date: Thu Jan 01 00:00:00 1970 +0000 |
777 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
778 | obsolete: rewritten as eb5a0daa2192 |
772 | summary: A0 |
779 | summary: A0 |
773 | |
780 | |
774 o changeset: 0:ea207398892e |
781 o changeset: 0:ea207398892e |
775 user: test |
782 user: test |
776 date: Thu Jan 01 00:00:00 1970 +0000 |
783 date: Thu Jan 01 00:00:00 1970 +0000 |
967 | summary: A1 |
974 | summary: A1 |
968 | |
975 | |
969 | x changeset: 1:471f378eab4c |
976 | x changeset: 1:471f378eab4c |
970 |/ user: test |
977 |/ user: test |
971 | date: Thu Jan 01 00:00:00 1970 +0000 |
978 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
979 | obsolete: rewritten as fdf9bde5129a |
972 | summary: A0 |
980 | summary: A0 |
973 | |
981 | |
974 o changeset: 0:ea207398892e |
982 o changeset: 0:ea207398892e |
975 user: test |
983 user: test |
976 date: Thu Jan 01 00:00:00 1970 +0000 |
984 date: Thu Jan 01 00:00:00 1970 +0000 |
999 | summary: A1 |
1007 | summary: A1 |
1000 | |
1008 | |
1001 | x changeset: 1:471f378eab4c |
1009 | x changeset: 1:471f378eab4c |
1002 |/ user: test |
1010 |/ user: test |
1003 | date: Thu Jan 01 00:00:00 1970 +0000 |
1011 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1012 | obsolete: rewritten as fdf9bde5129a |
|
1013 | obsolete: rewritten as 65b757b745b9 |
1004 | summary: A0 |
1014 | summary: A0 |
1005 | |
1015 | |
1006 o changeset: 0:ea207398892e |
1016 o changeset: 0:ea207398892e |
1007 user: test |
1017 user: test |
1008 date: Thu Jan 01 00:00:00 1970 +0000 |
1018 date: Thu Jan 01 00:00:00 1970 +0000 |
1280 | summary: B1 |
1290 | summary: B1 |
1281 | |
1291 | |
1282 | x changeset: 2:0dec01379d3b |
1292 | x changeset: 2:0dec01379d3b |
1283 |/ user: test |
1293 |/ user: test |
1284 | date: Thu Jan 01 00:00:00 1970 +0000 |
1294 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1295 | obsolete: rewritten as b7ea6d14e664 |
1285 | summary: B0 |
1296 | summary: B0 |
1286 | |
1297 | |
1287 o changeset: 1:471f378eab4c |
1298 o changeset: 1:471f378eab4c |
1288 | user: test |
1299 | user: test |
1289 | date: Thu Jan 01 00:00:00 1970 +0000 |
1300 | date: Thu Jan 01 00:00:00 1970 +0000 |
1307 | |
1318 | |
1308 | x changeset: 3:b7ea6d14e664 |
1319 | x changeset: 3:b7ea6d14e664 |
1309 | | parent: 1:471f378eab4c |
1320 | | parent: 1:471f378eab4c |
1310 | | user: test |
1321 | | user: test |
1311 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1322 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1323 | | obsolete: rewritten as eb5a0daa2192 |
1312 | | summary: B1 |
1324 | | summary: B1 |
1313 | | |
1325 | | |
1314 | | x changeset: 2:0dec01379d3b |
1326 | | x changeset: 2:0dec01379d3b |
1315 | |/ user: test |
1327 | |/ user: test |
1316 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1328 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1329 | | obsolete: rewritten as b7ea6d14e664 |
1317 | | summary: B0 |
1330 | | summary: B0 |
1318 | | |
1331 | | |
1319 | x changeset: 1:471f378eab4c |
1332 | x changeset: 1:471f378eab4c |
1320 |/ user: test |
1333 |/ user: test |
1321 | date: Thu Jan 01 00:00:00 1970 +0000 |
1334 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1335 | obsolete: rewritten as eb5a0daa2192 |
1322 | summary: A0 |
1336 | summary: A0 |
1323 | |
1337 | |
1324 o changeset: 0:ea207398892e |
1338 o changeset: 0:ea207398892e |
1325 user: test |
1339 user: test |
1326 date: Thu Jan 01 00:00:00 1970 +0000 |
1340 date: Thu Jan 01 00:00:00 1970 +0000 |
1540 | |
1554 | |
1541 | x changeset: 2:fdf9bde5129a |
1555 | x changeset: 2:fdf9bde5129a |
1542 |/ parent: 0:ea207398892e |
1556 |/ parent: 0:ea207398892e |
1543 | user: test |
1557 | user: test |
1544 | date: Thu Jan 01 00:00:00 1970 +0000 |
1558 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1559 | obsolete: rewritten as 7a230b46bf61 |
1545 | summary: A1 |
1560 | summary: A1 |
1546 | |
1561 | |
1547 | x changeset: 1:471f378eab4c |
1562 | x changeset: 1:471f378eab4c |
1548 |/ user: test |
1563 |/ user: test |
1549 | date: Thu Jan 01 00:00:00 1970 +0000 |
1564 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1565 | obsolete: rewritten as fdf9bde5129a |
1550 | summary: A0 |
1566 | summary: A0 |
1551 | |
1567 | |
1552 o changeset: 0:ea207398892e |
1568 o changeset: 0:ea207398892e |
1553 user: test |
1569 user: test |
1554 date: Thu Jan 01 00:00:00 1970 +0000 |
1570 date: Thu Jan 01 00:00:00 1970 +0000 |
1585 adding changesets |
1601 adding changesets |
1586 adding manifests |
1602 adding manifests |
1587 adding file changes |
1603 adding file changes |
1588 added 1 changesets with 0 changes to 1 files (+1 heads) |
1604 added 1 changesets with 0 changes to 1 files (+1 heads) |
1589 2 new obsolescence markers |
1605 2 new obsolescence markers |
|
1606 obsoleted 1 changesets |
1590 (run 'hg heads' to see heads, 'hg merge' to merge) |
1607 (run 'hg heads' to see heads, 'hg merge' to merge) |
1591 working directory parent is obsolete! (471f378eab4c) |
1608 working directory parent is obsolete! (471f378eab4c) |
1592 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1609 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1593 Check that debugobshistory works with markers pointing to missing local |
1610 Check that debugobshistory works with markers pointing to missing local |
1594 changectx |
1611 changectx |