view tests/test-changelog-exec.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 4b0c9c674707
children
line wrap: on
line source

% manifest of p2:
bar
foo

created new head
% manifest of p1:
foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% this should not mention bar:
changeset:   3:ef2fc9b4a51b
tag:         tip
parent:      2:ed1b79f46b9a
parent:      1:d394a8db219b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
description:
merge


   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       1 b004912a8510 000000000000 000000000000