Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 29648:94c5273c7d5d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: fix incorrect use of rst hg role in help text
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Mon, 01 Aug 2016 06:08:27 +0900
parents 9b6dc989f02b
children 7fa011555046 6eb9c8291a78
comparison
equal deleted inserted replaced
29647:9b6dc989f02b 29648:94c5273c7d5d
4836 If --exact is specified, import will set the working directory to 4836 If --exact is specified, import will set the working directory to
4837 the parent of each patch before applying it, and will abort if the 4837 the parent of each patch before applying it, and will abort if the
4838 resulting changeset has a different ID than the one recorded in 4838 resulting changeset has a different ID than the one recorded in
4839 the patch. This will guard against various ways that portable 4839 the patch. This will guard against various ways that portable
4840 patch formats and mail systems might fail to transfer Mercurial 4840 patch formats and mail systems might fail to transfer Mercurial
4841 data or metadata. See ':hg: bundle' for lossless transmission. 4841 data or metadata. See :hg:`bundle` for lossless transmission.
4842 4842
4843 Use --partial to ensure a changeset will be created from the patch 4843 Use --partial to ensure a changeset will be created from the patch
4844 even if some hunks fail to apply. Hunks that fail to apply will be 4844 even if some hunks fail to apply. Hunks that fail to apply will be
4845 written to a <target-file>.rej file. Conflicts can then be resolved 4845 written to a <target-file>.rej file. Conflicts can then be resolved
4846 by hand before :hg:`commit --amend` is run to update the created 4846 by hand before :hg:`commit --amend` is run to update the created