Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 9740:2ebe679fec21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: use enumerated lists in help texts
author Martin Geisler <mg@lazybytes.net>
date Sat, 07 Nov 2009 03:16:23 +0100
parents 36c388a1aa51
children 85a3285860d3
comparison
equal deleted inserted replaced
9739:75cff8f12910 9740:2ebe679fec21
597 Please see 'hg help urls' for important details about ssh:// URLs. 597 Please see 'hg help urls' for important details about ssh:// URLs.
598 598
599 If the -U/--noupdate option is specified, the new clone will contain 599 If the -U/--noupdate option is specified, the new clone will contain
600 only a repository (.hg) and no working copy (the working copy parent 600 only a repository (.hg) and no working copy (the working copy parent
601 will be the null changeset). Otherwise, clone will initially check 601 will be the null changeset). Otherwise, clone will initially check
602 out (in order of precedence): :: 602 out (in order of precedence):
603 603
604 a) the changeset, tag or branch specified with -u/--updaterev 604 a) the changeset, tag or branch specified with -u/--updaterev
605 b) the changeset, tag or branch given with the first -r/--rev 605 b) the changeset, tag or branch given with the first -r/--rev
606 c) the head of the default branch 606 c) the head of the default branch
607 607
3146 3146
3147 The following rules apply when the working directory contains 3147 The following rules apply when the working directory contains
3148 uncommitted changes: 3148 uncommitted changes:
3149 3149
3150 1. If neither -c/--check nor -C/--clean is specified, uncommitted 3150 1. If neither -c/--check nor -C/--clean is specified, uncommitted
3151 changes are merged into the requested changeset, and the merged result 3151 changes are merged into the requested changeset, and the merged result
3152 is left uncommitted. Updating and merging will occur only if the 3152 is left uncommitted. Updating and merging will occur only if the
3153 requested changeset is an ancestor or descendant of the parent 3153 requested changeset is an ancestor or descendant of the parent
3154 changeset. Otherwise, the update is aborted and the uncommitted changes 3154 changeset. Otherwise, the update is aborted and the uncommitted changes
3155 are preserved. 3155 are preserved.
3156 3156
3157 2. With the -c/--check option, the update is aborted and the 3157 2. With the -c/--check option, the update is aborted and the
3158 uncommitted changes are preserved. 3158 uncommitted changes are preserved.
3159 3159
3160 3. With the -C/--clean option, uncommitted changes are discarded and 3160 3. With the -C/--clean option, uncommitted changes are discarded and
3161 the working directory is updated to the requested changeset. 3161 the working directory is updated to the requested changeset.
3162 3162
3163 Use null as the changeset to remove the working directory (like 'hg 3163 Use null as the changeset to remove the working directory (like 'hg
3164 clone -U'). 3164 clone -U').
3165 3165
3166 If you want to update just one file to an older changeset, use 'hg revert'. 3166 If you want to update just one file to an older changeset, use 'hg revert'.