Mercurial > hg
view tests/test-simple-update @ 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 | ad3d5b4367cb |
children |
line wrap: on
line source
#!/bin/sh set -e mkdir test cd test echo foo>foo hg init hg addremove hg commit -m "1" hg verify hg clone . ../branch cd ../branch hg co echo bar>>foo hg commit -m "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest --debug