Mercurial > hg

comparison tests/test-update-branches.t @ 35711:35a0f6f31eef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: display the obsfate of hidden revision we update to Display the same message we added recently to the filtered error message when updating to a hidden obsolete changeset. Differential Revision: https://phab.mercurial-scm.org/D1869
author Boris Feld <boris.feld@octobus.net>
date Tue, 16 Jan 2018 14:08:54 +0100
parents 02fdb8c018aa
children ea63a2004d09
comparison
equal deleted inserted replaced
35710:5cd60b0587a8 35711:35a0f6f31eef
519 Test that 4 is detected as the no-argument destination from 3 and also moves 519 Test that 4 is detected as the no-argument destination from 3 and also moves
520 the bookmark with it 520 the bookmark with it
521 $ hg up --quiet 0 # we should be able to update to 3 directly 521 $ hg up --quiet 0 # we should be able to update to 3 directly
522 $ hg up --quiet --hidden 3 # but not implemented yet. 522 $ hg up --quiet --hidden 3 # but not implemented yet.
523 updating to a hidden changeset 6efa171f091b 523 updating to a hidden changeset 6efa171f091b
524 (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
524 $ hg book -f bm 525 $ hg book -f bm
525 $ hg up 526 $ hg up
526 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 527 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
527 updating bookmark bm 528 updating bookmark bm
528 $ hg book 529 $ hg book
530 531
531 Test that 5 is detected as a valid destination from 1 532 Test that 5 is detected as a valid destination from 1
532 $ hg up --quiet 0 # we should be able to update to 3 directly 533 $ hg up --quiet 0 # we should be able to update to 3 directly
533 $ hg up --quiet --hidden 3 # but not implemented yet. 534 $ hg up --quiet --hidden 3 # but not implemented yet.
534 updating to a hidden changeset 6efa171f091b 535 updating to a hidden changeset 6efa171f091b
536 (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
535 $ hg up 5 537 $ hg up 5
536 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 538 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
537 539
538 Test that 5 is not detected as a valid destination from 2 540 Test that 5 is not detected as a valid destination from 2
539 $ hg up --quiet 0 541 $ hg up --quiet 0