514 $ hg book bm |
514 $ hg book bm |
515 moving bookmark 'bm' forward from 6efa171f091b |
515 moving bookmark 'bm' forward from 6efa171f091b |
516 $ hg bookmarks |
516 $ hg bookmarks |
517 * bm 5:ff252e8273df |
517 * bm 5:ff252e8273df |
518 |
518 |
|
519 Test that we abort before we warn about the hidden commit if the working |
|
520 directory is dirty |
|
521 $ echo conflict > a |
|
522 $ hg up --hidden 3 |
|
523 abort: uncommitted changes |
|
524 (commit or update --clean to discard changes) |
|
525 [255] |
|
526 |
|
527 Test that we still warn also when there are conflicts |
|
528 $ hg up -m --hidden 3 |
|
529 merging a |
|
530 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
531 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
532 use 'hg resolve' to retry unresolved file merges |
|
533 (leaving bookmark bm) |
|
534 updated to hidden changeset 6efa171f091b |
|
535 (hidden revision '6efa171f091b' was rewritten as: d047485b3896) |
|
536 [1] |
|
537 $ hg revert -r . a |
|
538 $ hg resolve -m |
|
539 (no more unresolved files) |
|
540 |
519 Test that 4 is detected as the no-argument destination from 3 and also moves |
541 Test that 4 is detected as the no-argument destination from 3 and also moves |
520 the bookmark with it |
542 the bookmark with it |
521 $ hg up --quiet 0 # we should be able to update to 3 directly |
543 $ hg up --quiet 0 # we should be able to update to 3 directly |
522 $ hg up --quiet --hidden 3 # but not implemented yet. |
544 $ hg up --quiet --hidden 3 # but not implemented yet. |
523 updating to a hidden changeset 6efa171f091b |
545 updated to hidden changeset 6efa171f091b |
524 (hidden revision '6efa171f091b' was rewritten as: d047485b3896) |
546 (hidden revision '6efa171f091b' was rewritten as: d047485b3896) |
525 $ hg book -f bm |
547 $ hg book -f bm |
526 $ hg up |
548 $ hg up |
527 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
549 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
528 updating bookmark bm |
550 updating bookmark bm |
530 * bm 4:d047485b3896 |
552 * bm 4:d047485b3896 |
531 |
553 |
532 Test that 5 is detected as a valid destination from 1 |
554 Test that 5 is detected as a valid destination from 1 |
533 $ hg up --quiet 0 # we should be able to update to 3 directly |
555 $ hg up --quiet 0 # we should be able to update to 3 directly |
534 $ hg up --quiet --hidden 3 # but not implemented yet. |
556 $ hg up --quiet --hidden 3 # but not implemented yet. |
535 updating to a hidden changeset 6efa171f091b |
557 updated to hidden changeset 6efa171f091b |
536 (hidden revision '6efa171f091b' was rewritten as: d047485b3896) |
558 (hidden revision '6efa171f091b' was rewritten as: d047485b3896) |
537 $ hg up 5 |
559 $ hg up 5 |
538 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
560 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
539 |
561 |
540 Test that 5 is not detected as a valid destination from 2 |
562 Test that 5 is not detected as a valid destination from 2 |