201 $ hg update 471f378eab4c |
201 $ hg update 471f378eab4c |
202 abort: hidden revision '471f378eab4c'! |
202 abort: hidden revision '471f378eab4c'! |
203 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) |
203 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) |
204 [255] |
204 [255] |
205 $ hg update --hidden "desc(A0)" |
205 $ hg update --hidden "desc(A0)" |
206 updating to a hidden changeset 471f378eab4c |
|
207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
206 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
208 working directory parent is obsolete! (471f378eab4c) |
207 working directory parent is obsolete! (471f378eab4c) |
209 (use 'hg evolve' to update to its successor: 4ae3a4151de9) |
208 (use 'hg evolve' to update to its successor: 4ae3a4151de9) |
210 |
209 |
211 Test output with pruned commit |
210 Test output with pruned commit |
302 $ hg up 0dec01379d3b |
301 $ hg up 0dec01379d3b |
303 abort: hidden revision '0dec01379d3b'! |
302 abort: hidden revision '0dec01379d3b'! |
304 (use --hidden to access hidden revisions; pruned) |
303 (use --hidden to access hidden revisions; pruned) |
305 [255] |
304 [255] |
306 $ hg up --hidden -r 'desc(B0)' |
305 $ hg up --hidden -r 'desc(B0)' |
307 updating to a hidden changeset 0dec01379d3b |
|
308 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
309 working directory parent is obsolete! (0dec01379d3b) |
307 working directory parent is obsolete! (0dec01379d3b) |
310 (use 'hg evolve' to update to its parent successor) |
308 (use 'hg evolve' to update to its parent successor) |
311 |
309 |
312 Test output with splitted commit |
310 Test output with splitted commit |
499 $ hg update 471597cad322 |
497 $ hg update 471597cad322 |
500 abort: hidden revision '471597cad322'! |
498 abort: hidden revision '471597cad322'! |
501 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
499 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
502 [255] |
500 [255] |
503 $ hg update --hidden 'min(desc(A0))' |
501 $ hg update --hidden 'min(desc(A0))' |
504 updating to a hidden changeset 471597cad322 |
|
505 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
502 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
506 working directory parent is obsolete! (471597cad322) |
503 working directory parent is obsolete! (471597cad322) |
507 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
504 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
508 |
505 |
509 Test output with lots of splitted commit |
506 Test output with lots of splitted commit |
777 $ hg update de7290d8b885 |
774 $ hg update de7290d8b885 |
778 abort: hidden revision 'de7290d8b885'! |
775 abort: hidden revision 'de7290d8b885'! |
779 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
776 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
780 [255] |
777 [255] |
781 $ hg update --hidden 'min(desc(A0))' |
778 $ hg update --hidden 'min(desc(A0))' |
782 updating to a hidden changeset de7290d8b885 |
|
783 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
779 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
784 working directory parent is obsolete! (de7290d8b885) |
780 working directory parent is obsolete! (de7290d8b885) |
785 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |
781 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |
786 |
782 |
787 Test output with folded commit |
783 Test output with folded commit |
999 $ hg update 471f378eab4c |
995 $ hg update 471f378eab4c |
1000 abort: hidden revision '471f378eab4c'! |
996 abort: hidden revision '471f378eab4c'! |
1001 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
997 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1002 [255] |
998 [255] |
1003 $ hg update --hidden 'desc(A0)' |
999 $ hg update --hidden 'desc(A0)' |
1004 updating to a hidden changeset 471f378eab4c |
|
1005 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1006 working directory parent is obsolete! (471f378eab4c) |
1001 working directory parent is obsolete! (471f378eab4c) |
1007 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1002 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1008 $ hg update 0dec01379d3b |
1003 $ hg update 0dec01379d3b |
1009 abort: hidden revision '0dec01379d3b'! |
1004 abort: hidden revision '0dec01379d3b'! |
1010 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1005 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1011 [255] |
1006 [255] |
1012 $ hg update --hidden 'desc(B0)' |
1007 $ hg update --hidden 'desc(B0)' |
1013 updating to a hidden changeset 0dec01379d3b |
|
1014 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1008 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1015 working directory parent is obsolete! (0dec01379d3b) |
1009 working directory parent is obsolete! (0dec01379d3b) |
1016 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1010 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1017 |
1011 |
1018 Test output with divergence |
1012 Test output with divergence |
1044 user: test |
1038 user: test |
1045 date: Thu Jan 01 00:00:00 1970 +0000 |
1039 date: Thu Jan 01 00:00:00 1970 +0000 |
1046 summary: ROOT |
1040 summary: ROOT |
1047 |
1041 |
1048 $ hg update --hidden 'desc(A0)' |
1042 $ hg update --hidden 'desc(A0)' |
1049 updating to a hidden changeset 471f378eab4c |
|
1050 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1043 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1051 working directory parent is obsolete! (471f378eab4c) |
1044 working directory parent is obsolete! (471f378eab4c) |
1052 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
1045 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
1053 $ hg amend -m "A2" |
1046 $ hg amend -m "A2" |
1054 2 new content-divergent changesets |
1047 2 new content-divergent changesets |
1339 $ hg update 471f378eab4c |
1332 $ hg update 471f378eab4c |
1340 abort: hidden revision '471f378eab4c'! |
1333 abort: hidden revision '471f378eab4c'! |
1341 (use --hidden to access hidden revisions; diverged) |
1334 (use --hidden to access hidden revisions; diverged) |
1342 [255] |
1335 [255] |
1343 $ hg update --hidden 'desc(A0)' |
1336 $ hg update --hidden 'desc(A0)' |
1344 updating to a hidden changeset 471f378eab4c |
|
1345 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1346 working directory parent is obsolete! (471f378eab4c) |
1338 working directory parent is obsolete! (471f378eab4c) |
1347 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
1339 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
1348 |
1340 |
1349 Test output with amended + folded commit |
1341 Test output with amended + folded commit |
1566 $ hg update 471f378eab4c |
1558 $ hg update 471f378eab4c |
1567 abort: hidden revision '471f378eab4c'! |
1559 abort: hidden revision '471f378eab4c'! |
1568 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1560 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1569 [255] |
1561 [255] |
1570 $ hg update --hidden 'desc(A0)' |
1562 $ hg update --hidden 'desc(A0)' |
1571 updating to a hidden changeset 471f378eab4c |
|
1572 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1563 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1573 working directory parent is obsolete! (471f378eab4c) |
1564 working directory parent is obsolete! (471f378eab4c) |
1574 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1565 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1575 $ hg update --hidden 0dec01379d3b |
1566 $ hg update --hidden 0dec01379d3b |
1576 updating to a hidden changeset 0dec01379d3b |
|
1577 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1567 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1578 working directory parent is obsolete! (0dec01379d3b) |
1568 working directory parent is obsolete! (0dec01379d3b) |
1579 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1569 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1580 $ hg update 0dec01379d3b |
1570 $ hg update 0dec01379d3b |
1581 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1571 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |