Mercurial > hg
view tests/test-nested-repo @ 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 | c7e8fe11f34a |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a hg init b echo x > b/x echo '# should print nothing' hg add b hg st echo '# should fail' hg st b/x hg add b/x echo '# should fail' hg add b b/x hg st echo '# should arguably print nothing' hg st b echo a > a hg ci -Ama a echo '# should fail' hg mv a b hg st