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