Mercurial > hg
view tests/test-issue1438 @ 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 | 2c5b2abfb8be |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" symlink || exit 80 rm -rf a hg init a cd a ln -s foo link hg add link hg ci -mbad link hg rm link hg ci -mok hg diff -g -r 0:1 > bad.patch hg up 0 hg import --no-commit bad.patch hg st