view tests/test-import-eol.out @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents 6c9dce20ed70
children 1720d70cd6d4
line wrap: on
line source

adding .hgignore
adding a
% invalid eol
applying eol.diff
abort: Unsupported line endings type: LFCR
% force LF
applying eol.diff
'a\nyyyy\ncc\n\nd\ne'
% force CRLF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying eol.diff
'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne'
adding b
% binary patch with --eol
applying bin.diff
'a\x00\nc'