Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 6673:16d2d093d1dd
update: improved help text
Using the term "the repository's working directory" instead of just "working
directory" to make it nearly impossible to confuse it with $PWD.
Also, this new wording better conveys the fact that update applies
to the working dir as a whole (no matter what the $PWD currently is).
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 11 Jun 2008 13:51:57 +0200 |
parents | 034f444902d9 |
children | 3101e30fd762 |
comparison
equal
deleted
inserted
replaced
6672:6004eedb13f4 | 6673:16d2d093d1dd |
---|---|
2820 return postincoming(ui, repo, modheads, opts['update'], None) | 2820 return postincoming(ui, repo, modheads, opts['update'], None) |
2821 | 2821 |
2822 def update(ui, repo, node=None, rev=None, clean=False, date=None): | 2822 def update(ui, repo, node=None, rev=None, clean=False, date=None): |
2823 """update working directory | 2823 """update working directory |
2824 | 2824 |
2825 Update the working directory to the specified revision, or the | 2825 Update the repository's working directory to the specified revision, |
2826 tip of the current branch if none is specified. | 2826 or the tip of the current branch if none is specified. |
2827 | 2827 |
2828 If the requested revision is a descendant of the working | 2828 If the requested revision is a descendant of the working |
2829 directory, any outstanding changes in the working directory will | 2829 directory, any outstanding changes in the working directory will |
2830 be merged into the result. If it is not directly descended but is | 2830 be merged into the result. If it is not directly descended but is |
2831 on the same named branch, update aborts with a suggestion to use | 2831 on the same named branch, update aborts with a suggestion to use |