Mercurial > hg
changeset 25651:125c11ec7bee
import: cross-reference patch.fuzz option from `hg help import`
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Tue, 23 Jun 2015 13:56:53 -0400 |
| parents | e43e7d58a65d |
| children | 2882d6886919 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Jun 23 13:57:39 2015 -0400 +++ b/mercurial/commands.py Tue Jun 23 13:56:53 2015 -0400 @@ -4174,9 +4174,10 @@ importing only the patch metadata. It is possible to use external patch programs to perform the patch - by setting the ``ui.patch`` configuration option. + by setting the ``ui.patch`` configuration option. For the default + internal tool, the fuzz can also be configured via ``patch.fuzz``. See :hg:`help config` for more information about configuration - files and how to use this option. + files and how to use these options. To read a patch from standard input, use "-" as the patch name. If a URL is specified, the patch will be downloaded from it. @@ -4208,6 +4209,10 @@ hg import --config ui.patch="patch --merge" fuzzy.patch + - change the default fuzzing from 2 to a less strict 7 + + hg import --config ui.fuzz=7 fuzz.patch + Returns 0 on success, 1 on partial success (see --partial). """