annotate tests/test-diff-copy-depth.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 |
d8f44384c3ee |
| children |
|
| rev |
line source |
|
6424
|
1 -- With aaa
|
|
|
2 Status:
|
|
|
3 A somename
|
|
|
4 other-file
|
|
|
5
|
|
|
6 Diff:
|
|
|
7 diff --git a/other-file b/somename
|
|
|
8 copy from other-file
|
|
|
9 copy to somename
|
|
|
10
|
|
|
11 -- With zzz
|
|
|
12 Status:
|
|
|
13 A somename
|
|
|
14 other-file
|
|
|
15
|
|
|
16 Diff:
|
|
|
17 diff --git a/other-file b/somename
|
|
|
18 copy from other-file
|
|
|
19 copy to somename
|
|
|
20
|
