diff doc/hgrc.5.txt @ 8810:ac92775b3b80

Add patch.eol to ignore EOLs when patching (issue1019)

The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.

--- a/doc/hgrc.5.txt	Sun Jun 14 13:32:19 2009 -0700
+++ b/doc/hgrc.5.txt	Mon Jun 15 00:03:26 2009 +0200
@@ -607,6 +607,17 @@
     Optional. It's the hostname that the sender can use to identify
     itself to the MTA.
 
+[[patch]]
+patch::
+  Settings used when applying patches, for instance through the 'import'
+  command or with Mercurial Queues extension.
+  eol;;
+    When set to 'strict' patch content and patched files end of lines
+    are preserved. When set to 'lf' or 'crlf', both files end of lines
+    are ignored when patching and the result line endings are
+    normalized to either LF (Unix) or CRLF (Windows).
+    Default: strict.
+
 [[paths]]
 paths::
   Assigns symbolic names to repositories. The left side is the