Mercurial > hg
comparison 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.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
parents | d19ab9a56bf4 |
children | 7951f385fcb7 |
comparison
equal
deleted
inserted
replaced
8809:6fce36336e42 | 8810:ac92775b3b80 |
---|---|
604 username is specified, password must also be specified. | 604 username is specified, password must also be specified. |
605 Default: none. | 605 Default: none. |
606 local_hostname;; | 606 local_hostname;; |
607 Optional. It's the hostname that the sender can use to identify | 607 Optional. It's the hostname that the sender can use to identify |
608 itself to the MTA. | 608 itself to the MTA. |
609 | |
610 [[patch]] | |
611 patch:: | |
612 Settings used when applying patches, for instance through the 'import' | |
613 command or with Mercurial Queues extension. | |
614 eol;; | |
615 When set to 'strict' patch content and patched files end of lines | |
616 are preserved. When set to 'lf' or 'crlf', both files end of lines | |
617 are ignored when patching and the result line endings are | |
618 normalized to either LF (Unix) or CRLF (Windows). | |
619 Default: strict. | |
609 | 620 |
610 [[paths]] | 621 [[paths]] |
611 paths:: | 622 paths:: |
612 Assigns symbolic names to repositories. The left side is the | 623 Assigns symbolic names to repositories. The left side is the |
613 symbolic name, and the right gives the directory or URL that is the | 624 symbolic name, and the right gives the directory or URL that is the |