Mercurial > hg
view tests/test-permissions @ 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 | 0df098871e3d |
children | c1b11ee12fe7 |
line wrap: on
line source
#!/bin/sh hg init t cd t echo foo > a hg add a hg commit -m "1" -d "1000000 0" hg verify chmod -r .hg/store/data/a.i hg verify 2>/dev/null || echo verify failed chmod +r .hg/store/data/a.i hg verify 2>/dev/null || echo verify failed chmod -w .hg/store/data/a.i echo barber > a hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed chmod -w . hg diff --nodates chmod +w . chmod +w .hg/store/data/a.i mkdir dir touch dir/a hg status chmod -rx dir hg status # reenable perm to allow deletion chmod +rx dir