Mercurial > hg
view tests/test-up-issue1456 @ 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 | f331de880cbb |
children |
line wrap: on
line source
#!/bin/sh rm -rf a hg init a cd a echo foo > foo hg ci -qAm0 chmod +x foo hg ci -m1 hg co -q 0 echo dirty > foo hg up -c hg up -q cat foo hg st -A echo '% validate update of standalone execute bit change' hg up -C 0 chmod -x foo hg ci -m removeexec hg up -C 0 hg up hg st