Mercurial > hg
view tests/test-hgignore.out @ 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 | 31abcae33b4f |
children |
line wrap: on
line source
% should display baz only ? baz -- A dir/b.o ? a.c ? a.o ? dir/c.o ? syntax -- abort: .hgignore: invalid pattern (relre): *.o -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? a.c ? a.o ? dir/c.o ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- .hgignore: ignoring invalid syntax 'invalid' A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o -- A dir/b.o -- A b.o