comparison mercurial/commands.py @ 15957:12a1c9e92d66 stable

update: note ways to avoid moving bookmark
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 19 Jan 2012 16:10:26 -0600
parents 27f56b73522c
children 0d2ac0299020
comparison
equal deleted inserted replaced
15956:5653f2d166ea 15957:12a1c9e92d66
5636 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): 5636 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5637 """update working directory (or switch revisions) 5637 """update working directory (or switch revisions)
5638 5638
5639 Update the repository's working directory to the specified 5639 Update the repository's working directory to the specified
5640 changeset. If no changeset is specified, update to the tip of the 5640 changeset. If no changeset is specified, update to the tip of the
5641 current named branch and move the current bookmark. 5641 current named branch and move the current bookmark (see :hg:`help
5642 bookmarks`).
5642 5643
5643 If the changeset is not a descendant of the working directory's 5644 If the changeset is not a descendant of the working directory's
5644 parent, the update is aborted. With the -c/--check option, the 5645 parent, the update is aborted. With the -c/--check option, the
5645 working directory is checked for uncommitted changes; if none are 5646 working directory is checked for uncommitted changes; if none are
5646 found, the working directory is updated to the specified 5647 found, the working directory is updated to the specified