Mercurial > hg
view tests/test-convert-bzr-directories.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 | 209ef5f3534c |
| children |
line wrap: on
line source
% empty directory initializing destination source-hg repository scanning source... sorting... converting... 2 Initial add 1 Empty directory added 0 Added file into directory % manifest of 1 644 a % manifest of tip 644 a 644 empty/something % directory renames tpyo => typo initializing destination source-hg repository scanning source... sorting... converting... 1 Added directory 0 Oops, typo % manifest of 0 644 tpyo/something % manifest of tip 644 typo/something % nested directory renames firstlevel/secondlevel => secondlevel initializing destination source-hg repository scanning source... sorting... converting... 1 Added nested directories 0 Moved secondlevel one level up % manifest of tip 644 secondlevel/file 644 secondlevel/thirdlevel/stuff % directory remove initializing destination source-hg repository scanning source... sorting... converting... 1 Added directory 0 Removed directory % manifest of 0 644 src/sourcecode % manifest of tip % directory replace first/file => second/file first => third initializing destination source-hg repository scanning source... sorting... converting... 1 Initial layout 0 Some conflicting moves % manifest of tip 644 second/file 644 second/something 644 third/dummy