Mercurial > hg
annotate tests/test-hgcia.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 | b80b944836ec |
children |
rev | line source |
---|---|
7438 | 1 adding foo |
2 pushing to ../cia | |
3 searching for changes | |
4 adding changesets | |
5 adding manifests | |
6 adding file changes | |
7 added 1 changesets with 1 changes to 1 files | |
8 | |
9 <message> | |
10 <generator> | |
11 <name>Mercurial (hgcia)</name> | |
12 <version>0.1</version> | |
13 <url>http://hg.kublai.com/mercurial/hgcia</url> | |
14 <user>testuser</user> | |
15 </generator> | |
16 <source> | |
17 <project>testproject</project> | |
18 <branch>default</branch> | |
19 </source> | |
20 <body> | |
21 <commit> | |
22 <author>test</author> | |
23 <version>0:e63c23eaa88a</version> | |
24 <log>foo</log> | |
25 | |
26 <files><file action="add">foo</file></files> | |
27 </commit> | |
28 </body> | |
29 <timestamp>0</timestamp> | |
30 </message> |