view tests/test-pull-r.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 b8346ae5d64b
children d42821cd5c96
line wrap: on
line source

changeset:   2:effea6de0384
tag:         tip
parent:      0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add bar

changeset:   1:ed1b79f46b9a
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change foo

changeset:   0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull a missing revision
abort: unknown revision 'missing'!
% pull -r 0
changeset:   0:bbd179dfa0a7
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull -r 1
changeset:   1:ed1b79f46b9a
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change foo

changeset:   0:bbd179dfa0a7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo

% pull -r 1 again