facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

help: improve wording of update help text

Browse Source
This commit is contained in:
Stuart W Marks 2009-11-10 22:27:31 -08:00
parent d8dd14a3aa
commit ee6cd48d72
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/commands.py
View File

@ -3149,11 +3149,13 @@ def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
The following rules apply when the working directory contains
uncommitted changes:
1. If neither -c/--check nor -C/--clean is specified, uncommitted
changes are merged into the requested changeset, and the merged result
is left uncommitted. Updating and merging will occur only if the
requested changeset is an ancestor or descendant of the parent
changeset. Otherwise, the update is aborted and the uncommitted changes
1. If neither -c/--check nor -C/--clean is specified, and if
the requested changeset is an ancestor or descendant of
the working directory's parent, the uncommitted changes
are merged into the requested changeset and the merged
result is left uncommitted. If the requested changeset is
not an ancestor or descendant (that is, it is on another
branch), the update is aborted and the uncommitted changes
are preserved.
2. With the -c/--check option, the update is aborted and the