Mercurial > hg
view tests/test-diff-hashes @ 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 | c2d0ed7f4af8 |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a hg diff not found echo bar > foo hg add foo hg ci -m 'add foo' -d '1000000 0' echo foobar > foo hg ci -m 'change foo' -d '1000001 0' echo 'quiet:' hg --quiet diff -r 0 -r 1 echo echo 'normal:' hg diff -r 0 -r 1 echo echo 'verbose:' hg --verbose diff -r 0 -r 1 echo echo 'debug:' hg --debug diff -r 0 -r 1 echo