Mercurial > hg-stable
changeset 28866:02be5fc18c0c
import: document --exact behavior in more detail
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 09 Mar 2016 10:47:33 -0500 |
| parents | 16255662446d |
| children | ffcc649a4e8f |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Apr 11 19:46:50 2016 +0200 +++ b/mercurial/commands.py Wed Mar 09 10:47:33 2016 -0500 @@ -4784,7 +4784,7 @@ ('', 'partial', None, _('commit even if some hunks fail')), ('', 'exact', None, - _('apply patch to the nodes from which it was generated')), + _('abort if patch would apply lossily')), ('', 'prefix', '', _('apply patch to subdirectory'), _('DIR')), ('', 'import-branch', None, @@ -4824,8 +4824,9 @@ If --exact is specified, import will set the working directory to the parent of each patch before applying it, and will abort if the resulting changeset has a different ID than the one recorded in - the patch. This may happen due to character set problems or other - deficiencies in the text patch format. + the patch. This will guard against various ways that portable + patch formats and mail systems might fail to transfer Mercurial + data or metadata. See ':hg: bundle' for lossless transmission. Use --partial to ensure a changeset will be created from the patch even if some hunks fail to apply. Hunks that fail to apply will be