view tests/test-issue1306.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 a3d73b3e1f8a
children
line wrap: on
line source

% initialize remote repo with branches
adding a
marked working directory as branch br
adding c
changeset:   2:1630aed6ed2b
branch:      br
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

changeset:   1:234f53e6c5ff
branch:      br
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

% try cloning -r branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating to branch br
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   2:1630aed6ed2b
branch:      br
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

% try cloning -rother clone#branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

% try cloning -r1 clone#branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating to branch br
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   1:234f53e6c5ff
branch:      br
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b