Mercurial > hg
view tests/test-empty-file.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 | 4b0c9c674707 |
children | 4c94b6d0fb1c |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head changeset: 2:62ec0e86d1e5 tag: tip parent: 0:567dde5e6e98 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add empty3 changeset: 1:41ab7b321727 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add empty2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3