Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 16877:6e578e77cbe6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: fix help regarding update to ancestor As pointed out on the user mailing list, hg will update just as happily to an ancestor if there are uncommitted changes as to a descendant.
author Kevin Bullock <kbullock@ringworld.org>
date Tue, 05 Jun 2012 13:33:52 -0500
parents 00e1e40d709c
children 2255950e1f76 52ea9ce5b641
comparison
equal deleted inserted replaced
16876:fdc879042414 16877:6e578e77cbe6
5605 Update the repository's working directory to the specified 5605 Update the repository's working directory to the specified
5606 changeset. If no changeset is specified, update to the tip of the 5606 changeset. If no changeset is specified, update to the tip of the
5607 current named branch and move the current bookmark (see :hg:`help 5607 current named branch and move the current bookmark (see :hg:`help
5608 bookmarks`). 5608 bookmarks`).
5609 5609
5610 If the changeset is not a descendant of the working directory's 5610 If the changeset is not a descendant or ancestor of the working
5611 parent, the update is aborted. With the -c/--check option, the 5611 directory's parent, the update is aborted. With the -c/--check
5612 working directory is checked for uncommitted changes; if none are 5612 option, the working directory is checked for uncommitted changes; if
5613 found, the working directory is updated to the specified 5613 none are found, the working directory is updated to the specified
5614 changeset. 5614 changeset.
5615 5615
5616 Update sets the working directory's parent revison to the specified 5616 Update sets the working directory's parent revison to the specified
5617 changeset (see :hg:`help parents`). 5617 changeset (see :hg:`help parents`).
5618 5618