Mercurial > hg
view tests/test-convert-bzr-directories.out @ 8810:ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
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