##// END OF EJS Templates
Add patch.eol to ignore EOLs when patching (issue1019)...
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.

File last commit:

r8810:ac92775b default
r8810:ac92775b default
Show More
test-import-eol.out
16 lines | 334 B | text/plain | TextLexer
adding .hgignore
adding a
% invalid eol
applying eol.diff
abort: Unsupported line endings type: LFCR
% force LF
applying eol.diff
'a\ny\nc\nd\nz'
% force CRLF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying eol.diff
'a\r\ny\r\nc\r\nd\r\nz'
adding b
% binary patch with --eol
applying bin.diff
'a\x00\nc'