Mercurial > hg
view tests/test-pull-pull-corruption2.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 | 57729c56a23c |
| children |
line wrap: on
line source
pulling from source1 requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 10 changes to 1 files (run 'hg update' to get a working copy) requesting all changes adding changesets adding manifests adding file changes added 10 changesets with 10 changes to 1 files checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 10 changesets, 10 total revisions checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 10 changesets, 10 total revisions