import: cross-reference ui.patch option from `hg help import`
authorJordi Gutiérrez Hermoso <jordigh@octave.org>
Tue, 23 Jun 2015 13:57:39 -0400
changeset 25650 e43e7d58a65d
parent 25649 e90e031b3016
child 25651 125c11ec7bee
import: cross-reference ui.patch option from `hg help import` This is a fairly obscure patch option. It seems reasonable to expose it a bit more from the help text for `hg import`.
mercurial/commands.py
--- a/mercurial/commands.py	Tue Jun 23 13:47:42 2015 -0400
+++ b/mercurial/commands.py	Tue Jun 23 13:57:39 2015 -0400
@@ -4173,6 +4173,11 @@
     cleanly, :hg:`import --partial` will create an empty changeset,
     importing only the patch metadata.
 
+    It is possible to use external patch programs to perform the patch
+    by setting the ``ui.patch`` configuration option.
+    See :hg:`help config` for more information about configuration
+    files and how to use this option.
+
     To read a patch from standard input, use "-" as the patch name. If
     a URL is specified, the patch will be downloaded from it.
     See :hg:`help dates` for a list of formats valid for -d/--date.
@@ -4198,6 +4203,11 @@
 
           hg import --exact proposed-fix.patch
 
+      - use an external tool to apply a patch which is too fuzzy for
+        the default internal tool.
+
+          hg import --config ui.patch="patch --merge" fuzzy.patch
+
     Returns 0 on success, 1 on partial success (see --partial).
     """