Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 9831:9ebad1b93456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: improve wording of update help text
author Stuart W Marks <smarks@smarks.org>
date Tue, 10 Nov 2009 22:27:31 -0800
parents dafbe321fc1a
children 0a3fc37261ab
comparison
equal deleted inserted replaced
9830:ab1625ccf3a9 9831:9ebad1b93456
3147 directory's parent, update to it, otherwise abort. 3147 directory's parent, update to it, otherwise abort.
3148 3148
3149 The following rules apply when the working directory contains 3149 The following rules apply when the working directory contains
3150 uncommitted changes: 3150 uncommitted changes:
3151 3151
3152 1. If neither -c/--check nor -C/--clean is specified, uncommitted 3152 1. If neither -c/--check nor -C/--clean is specified, and if
3153 changes are merged into the requested changeset, and the merged result 3153 the requested changeset is an ancestor or descendant of
3154 is left uncommitted. Updating and merging will occur only if the 3154 the working directory's parent, the uncommitted changes
3155 requested changeset is an ancestor or descendant of the parent 3155 are merged into the requested changeset and the merged
3156 changeset. Otherwise, the update is aborted and the uncommitted changes 3156 result is left uncommitted. If the requested changeset is
3157 not an ancestor or descendant (that is, it is on another
3158 branch), the update is aborted and the uncommitted changes
3157 are preserved. 3159 are preserved.
3158 3160
3159 2. With the -c/--check option, the update is aborted and the 3161 2. With the -c/--check option, the update is aborted and the
3160 uncommitted changes are preserved. 3162 uncommitted changes are preserved.
3161 3163