Mercurial > hg
view tests/test-diff-newlines @ 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 | b914f0557832 |
children |
line wrap: on
line source
#!/bin/sh hg init python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a hg ci -Ama -d '1 0' echo clean diff >> a hg ci -mb -d '2 0' hg diff -r0 -r1