Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 34919:1856de4d1297 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: mention long options explicitly in description of merge.update() The short options "-c" and "-C" may be confusing for a novice reading the documentation. Let's try to be more explicit, also mentioning the equivalent long options ("--check" and "--clean") in the comments.
author muxator <a.mux@inwind.it>
date Wed, 04 Oct 2017 23:22:34 +0200
parents df2ff314e36f
children 37450a122128
comparison
equal deleted inserted replaced
34918:274811627808 34919:1856de4d1297
1725 as a temporary fix and should be avoided in general. 1725 as a temporary fix and should be avoided in general.
1726 labels = labels to use for base, local and other 1726 labels = labels to use for base, local and other
1727 mergeforce = whether the merge was run with 'merge --force' (deprecated): if 1727 mergeforce = whether the merge was run with 'merge --force' (deprecated): if
1728 this is True, then 'force' should be True as well. 1728 this is True, then 'force' should be True as well.
1729 1729
1730 The table below shows all the behaviors of the update command 1730 The table below shows all the behaviors of the update command given the
1731 given the -c and -C or no options, whether the working directory 1731 -c/--check and -C/--clean or no options, whether the working directory is
1732 is dirty, whether a revision is specified, and the relationship of 1732 dirty, whether a revision is specified, and the relationship of the parent
1733 the parent rev to the target rev (linear or not). Match from top first. The 1733 rev to the target rev (linear or not). Match from top first. The -n
1734 -n option doesn't exist on the command line, but represents the 1734 option doesn't exist on the command line, but represents the
1735 experimental.updatecheck=noconflict option. 1735 experimental.updatecheck=noconflict option.
1736 1736
1737 This logic is tested by test-update-branches.t. 1737 This logic is tested by test-update-branches.t.
1738 1738
1739 -c -C -n -m dirty rev linear | result 1739 -c -C -n -m dirty rev linear | result