Mercurial > hg
view tests/test-issue842 @ 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 | cb93eee1fbcd |
children |
line wrap: on
line source
#!/bin/sh hg init test cd test echo foo > a hg ci -Ama hg up -r0000 echo bar > a echo % should issue warning hg ci -Amb hg up -r0000 echo stuffy > a echo % should not issue warning hg ci -q -Amc hg up -r0000 echo crap > a hg branch testing echo % should not issue warning hg ci -q -Amd