Mercurial > hg
comparison tests/test-import-eol.out @ 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 | 7936cd261dc9 |
comparison
equal
deleted
inserted
replaced
| 10126:78b8acae2088 | 10127:d8214e944b84 |
|---|---|
| 15 applying eol.diff | 15 applying eol.diff |
| 16 'a\nyyyy\ncc\n\nd\ne' | 16 'a\nyyyy\ncc\n\nd\ne' |
| 17 % auto EOL on CRLF file | 17 % auto EOL on CRLF file |
| 18 applying eol.diff | 18 applying eol.diff |
| 19 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' | 19 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' |
| 20 % auto EOL on new file or source without any EOL | |
| 21 applying noeol.diff | |
| 22 'noeol\r\nnoeol\n' | |
| 23 'neweol\nneweol\r\n' | |
| 20 adding b | 24 adding b |
| 21 % binary patch with --eol | 25 % binary patch with --eol |
| 22 applying bin.diff | 26 applying bin.diff |
| 23 'a\x00\nc' | 27 'a\x00\nc' |