comparison mercurial/commands.py @ 16881:2255950e1f76

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jun 2012 21:17:33 -0500
parents d566aa319d5f 6e578e77cbe6
children 0c9c41e53f1a
comparison
equal deleted inserted replaced
16875:ee9bd7ef0a0e 16881:2255950e1f76
5655 Update the repository's working directory to the specified 5655 Update the repository's working directory to the specified
5656 changeset. If no changeset is specified, update to the tip of the 5656 changeset. If no changeset is specified, update to the tip of the
5657 current named branch and move the current bookmark (see :hg:`help 5657 current named branch and move the current bookmark (see :hg:`help
5658 bookmarks`). 5658 bookmarks`).
5659 5659
5660 If the changeset is not a descendant of the working directory's 5660 If the changeset is not a descendant or ancestor of the working
5661 parent, the update is aborted. With the -c/--check option, the 5661 directory's parent, the update is aborted. With the -c/--check
5662 working directory is checked for uncommitted changes; if none are 5662 option, the working directory is checked for uncommitted changes; if
5663 found, the working directory is updated to the specified 5663 none are found, the working directory is updated to the specified
5664 changeset. 5664 changeset.
5665 5665
5666 Update sets the working directory's parent revison to the specified 5666 Update sets the working directory's parent revison to the specified
5667 changeset (see :hg:`help parents`). 5667 changeset (see :hg:`help parents`).
5668 5668