Mercurial > hg
comparison doc/hgrc.5.txt @ 10127:d8214e944b84
patch: fix eolmode=auto with new files
If target file does not exist or has no eol, current code was normalizing eols
to LF. Preserve patch file eols instead.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 23 Dec 2009 19:31:47 +0100 |
parents | 1720d70cd6d4 |
children | 3ab391dd5ec5 |
comparison
equal
deleted
inserted
replaced
10126:78b8acae2088 | 10127:d8214e944b84 |
---|---|
644 Settings used when applying patches, for instance through the 'import' | 644 Settings used when applying patches, for instance through the 'import' |
645 command or with Mercurial Queues extension. | 645 command or with Mercurial Queues extension. |
646 | 646 |
647 ``eol`` | 647 ``eol`` |
648 When set to 'strict' patch content and patched files end of lines | 648 When set to 'strict' patch content and patched files end of lines |
649 are preserved. When set to ``lf`` or ``crlf``, both files end of lines | 649 are preserved. When set to ``lf`` or ``crlf``, both files end of |
650 are ignored when patching and the result line endings are | 650 lines are ignored when patching and the result line endings are |
651 normalized to either LF (Unix) or CRLF (Windows). When set to | 651 normalized to either LF (Unix) or CRLF (Windows). When set to |
652 ``auto``, end of lines are again ignored while patching but line | 652 ``auto``, end of lines are again ignored while patching but line |
653 endings in patched files are normalized to their original setting | 653 endings in patched files are normalized to their original setting |
654 on a per-file basis. | 654 on a per-file basis. If target file does not exist or has no end |
655 of line, patch line endings are preserved. | |
655 Default: strict. | 656 Default: strict. |
656 | 657 |
657 | 658 |
658 ``paths`` | 659 ``paths`` |
659 """"""""" | 660 """"""""" |