Mercurial > hg
view tests/test-issue612 @ 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 | 9797124581c9 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir src echo a > src/a.c hg ci -Ama -d "10000000 0" hg mv src source hg ci -Ammove -d "1000000 0" hg co -C 0 echo new > src/a.c echo compiled > src/a.o hg ci -mupdate -d "1000000 0" hg st hg merge hg st