Mercurial > hg
view tests/test-rebase-newancestor.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 | 49efeed49c94 |
children |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 3:AD 1d4e82ed3c2a | | o 2:C 7e1afe9214b2 | | | o 1:B 0a6620c3c26a |/ o 0:A 1e635d440a73 @ 3:C 0c5887756284 | o 2:B 4f208f4a1507 | o 1:AD 1d4e82ed3c2a | o 0:A 1e635d440a73