view tests/test-hardlinks-safety.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 14639c050251
children
line wrap: on
line source

% no diff if hardlink
% init
adding foo to series file
applying foo
now at: foo
adding bar to series file
applying bar
now at: bar
430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar
%
foo
bar
%%%
430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
%
foo
patch foo finalized without changeset message
patch bar finalized without changeset message
%%%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
430ed4828a74fa4047bc816a25500f7472ab4bfe bar
%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
430ed4828a74fa4047bc816a25500f7472ab4bfe lbar
%%%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo