##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r10130:7936cd26 default
r10244:c4c0502b merge default
Show More
test-import-eol.out
27 lines | 667 B | text/plain | TextLexer
/ tests / test-import-eol.out
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 adding .hgignore
adding a
% invalid eol
applying eol.diff
abort: Unsupported line endings type: LFCR
% force LF
applying eol.diff
Colin Caughie
Fixed patch.eol bug that truncated all patched lines to one character...
r8817 'a\nyyyy\ncc\n\nd\ne'
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 % force CRLF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying eol.diff
Colin Caughie
Fixed patch.eol bug that truncated all patched lines to one character...
r8817 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne'
Martin Geisler
patch: implement patch.eol=auto mode...
r10102 % auto EOL on LF file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying eol.diff
'a\nyyyy\ncc\n\nd\ne'
% auto EOL on CRLF file
applying eol.diff
'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne'
Patrick Mezard
patch: fix eolmode=auto with new files...
r10127 % auto EOL on new file or source without any EOL
applying noeol.diff
'noeol\r\nnoeol\n'
'neweol\nneweol\r\n'
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 adding b
% binary patch with --eol
applying bin.diff
Patrick Mezard
test-import-eol: improve binary hunks test
r10130 'a\x00\nc\r\nd'