Mercurial > hg
view tests/test-addremove @ 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 | 627399330c7d |
children |
line wrap: on
line source
#!/bin/sh hg init rep cd rep mkdir dir touch foo dir/bar hg -v addremove hg -v commit -m "add 1" -d "1000000 0" cd dir/ touch ../foo_2 bar_2 hg -v addremove hg -v commit -m "add 2" -d "1000000 0" cd .. hg init sim cd sim echo a > a echo a >> a echo a >> a echo c > c hg commit -Ama mv a b rm c echo d > d hg addremove -n -s 50 # issue 1696 hg addremove -s 50 hg commit -mb