Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 3360:1905aac253f0
test: update output to 02fdb8c018aa
Now that we have directaccess in core, we get a new warning message when
updating to a hidden changeset. Update the tests.
CORE-TEST-OUTPUT-UPDATE: 02fdb8c018aa
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 05 Jan 2018 09:51:07 +0100 |
| parents | ae6fddf39933 |
| children | 1cb549cd6236 |
comparison
equal
deleted
inserted
replaced
| 3359:ae6fddf39933 | 3360:1905aac253f0 |
|---|---|
| 176 $ hg update 471f378eab4c | 176 $ hg update 471f378eab4c |
| 177 abort: hidden revision '471f378eab4c'! | 177 abort: hidden revision '471f378eab4c'! |
| 178 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) | 178 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) |
| 179 [255] | 179 [255] |
| 180 $ hg update --hidden "desc(A0)" | 180 $ hg update --hidden "desc(A0)" |
| 181 updating to a hidden changeset 471f378eab4c | |
| 181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 182 working directory parent is obsolete! (471f378eab4c) | 183 working directory parent is obsolete! (471f378eab4c) |
| 183 (use 'hg evolve' to update to its successor: 4ae3a4151de9) | 184 (use 'hg evolve' to update to its successor: 4ae3a4151de9) |
| 184 | 185 |
| 185 Test output with pruned commit | 186 Test output with pruned commit |
| 276 $ hg up 0dec01379d3b | 277 $ hg up 0dec01379d3b |
| 277 abort: hidden revision '0dec01379d3b'! | 278 abort: hidden revision '0dec01379d3b'! |
| 278 (use --hidden to access hidden revisions; pruned) | 279 (use --hidden to access hidden revisions; pruned) |
| 279 [255] | 280 [255] |
| 280 $ hg up --hidden -r 'desc(B0)' | 281 $ hg up --hidden -r 'desc(B0)' |
| 282 updating to a hidden changeset 0dec01379d3b | |
| 281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 282 working directory parent is obsolete! (0dec01379d3b) | 284 working directory parent is obsolete! (0dec01379d3b) |
| 283 (use 'hg evolve' to update to its parent successor) | 285 (use 'hg evolve' to update to its parent successor) |
| 284 | 286 |
| 285 Test output with splitted commit | 287 Test output with splitted commit |
| 472 $ hg update 471597cad322 | 474 $ hg update 471597cad322 |
| 473 abort: hidden revision '471597cad322'! | 475 abort: hidden revision '471597cad322'! |
| 474 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) | 476 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
| 475 [255] | 477 [255] |
| 476 $ hg update --hidden 'min(desc(A0))' | 478 $ hg update --hidden 'min(desc(A0))' |
| 479 updating to a hidden changeset 471597cad322 | |
| 477 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 480 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 478 working directory parent is obsolete! (471597cad322) | 481 working directory parent is obsolete! (471597cad322) |
| 479 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) | 482 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
| 480 | 483 |
| 481 Test output with lots of splitted commit | 484 Test output with lots of splitted commit |
| 749 $ hg update de7290d8b885 | 752 $ hg update de7290d8b885 |
| 750 abort: hidden revision 'de7290d8b885'! | 753 abort: hidden revision 'de7290d8b885'! |
| 751 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) | 754 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
| 752 [255] | 755 [255] |
| 753 $ hg update --hidden 'min(desc(A0))' | 756 $ hg update --hidden 'min(desc(A0))' |
| 757 updating to a hidden changeset de7290d8b885 | |
| 754 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 758 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 755 working directory parent is obsolete! (de7290d8b885) | 759 working directory parent is obsolete! (de7290d8b885) |
| 756 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) | 760 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |
| 757 | 761 |
| 758 Test output with folded commit | 762 Test output with folded commit |
| 966 $ hg update 471f378eab4c | 970 $ hg update 471f378eab4c |
| 967 abort: hidden revision '471f378eab4c'! | 971 abort: hidden revision '471f378eab4c'! |
| 968 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 972 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
| 969 [255] | 973 [255] |
| 970 $ hg update --hidden 'desc(A0)' | 974 $ hg update --hidden 'desc(A0)' |
| 975 updating to a hidden changeset 471f378eab4c | |
| 971 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 976 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 972 working directory parent is obsolete! (471f378eab4c) | 977 working directory parent is obsolete! (471f378eab4c) |
| 973 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 978 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 974 $ hg update 0dec01379d3b | 979 $ hg update 0dec01379d3b |
| 975 working directory parent is obsolete! (471f378eab4c) | 980 working directory parent is obsolete! (471f378eab4c) |
| 976 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 981 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 977 abort: hidden revision '0dec01379d3b'! | 982 abort: hidden revision '0dec01379d3b'! |
| 978 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 983 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
| 979 [255] | 984 [255] |
| 980 $ hg update --hidden 'desc(B0)' | 985 $ hg update --hidden 'desc(B0)' |
| 986 updating to a hidden changeset 0dec01379d3b | |
| 981 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 987 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 982 working directory parent is obsolete! (0dec01379d3b) | 988 working directory parent is obsolete! (0dec01379d3b) |
| 983 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 989 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 984 | 990 |
| 985 Test output with divergence | 991 Test output with divergence |
| 1011 user: test | 1017 user: test |
| 1012 date: Thu Jan 01 00:00:00 1970 +0000 | 1018 date: Thu Jan 01 00:00:00 1970 +0000 |
| 1013 summary: ROOT | 1019 summary: ROOT |
| 1014 | 1020 |
| 1015 $ hg update --hidden 'desc(A0)' | 1021 $ hg update --hidden 'desc(A0)' |
| 1022 updating to a hidden changeset 471f378eab4c | |
| 1016 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1023 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1017 working directory parent is obsolete! (471f378eab4c) | 1024 working directory parent is obsolete! (471f378eab4c) |
| 1018 (use 'hg evolve' to update to its successor: fdf9bde5129a) | 1025 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
| 1019 $ hg amend -m "A2" | 1026 $ hg amend -m "A2" |
| 1020 2 new content-divergent changesets | 1027 2 new content-divergent changesets |
| 1291 $ hg update 471f378eab4c | 1298 $ hg update 471f378eab4c |
| 1292 abort: hidden revision '471f378eab4c'! | 1299 abort: hidden revision '471f378eab4c'! |
| 1293 (use --hidden to access hidden revisions; diverged) | 1300 (use --hidden to access hidden revisions; diverged) |
| 1294 [255] | 1301 [255] |
| 1295 $ hg update --hidden 'desc(A0)' | 1302 $ hg update --hidden 'desc(A0)' |
| 1303 updating to a hidden changeset 471f378eab4c | |
| 1296 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1304 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1297 working directory parent is obsolete! (471f378eab4c) | 1305 working directory parent is obsolete! (471f378eab4c) |
| 1298 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) | 1306 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 1299 | 1307 |
| 1300 Test output with amended + folded commit | 1308 Test output with amended + folded commit |
| 1513 $ hg update 471f378eab4c | 1521 $ hg update 471f378eab4c |
| 1514 abort: hidden revision '471f378eab4c'! | 1522 abort: hidden revision '471f378eab4c'! |
| 1515 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 1523 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
| 1516 [255] | 1524 [255] |
| 1517 $ hg update --hidden 'desc(A0)' | 1525 $ hg update --hidden 'desc(A0)' |
| 1526 updating to a hidden changeset 471f378eab4c | |
| 1518 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1527 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 1519 working directory parent is obsolete! (471f378eab4c) | 1528 working directory parent is obsolete! (471f378eab4c) |
| 1520 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 1529 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 1521 $ hg update --hidden 0dec01379d3b | 1530 $ hg update --hidden 0dec01379d3b |
| 1531 updating to a hidden changeset 0dec01379d3b | |
| 1522 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1532 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1523 working directory parent is obsolete! (0dec01379d3b) | 1533 working directory parent is obsolete! (0dec01379d3b) |
| 1524 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 1534 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 1525 $ hg update 0dec01379d3b | 1535 $ hg update 0dec01379d3b |
| 1526 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1536 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |