Mercurial > hg
view tests/test-issue1175 @ 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 | 0d714a48ab53 |
children |
line wrap: on
line source
#!/bin/sh rm -rf a hg init a cd a touch a hg ci -Am0 hg mv a a1 hg ci -m1 hg co 0 hg mv a a2 hg up hg ci -m2 touch a hg ci -Am3 hg mv a b hg ci -Am4 a hg ci --debug --traceback -Am5 b hg verify hg export --git tip