view tests/test-convert-svn-move.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 90d8dfb481e7
children 8b603c7c808e
line wrap: on
line source

% convert trunk and branches
initializing destination A-hg repository
scanning source...
sorting...
converting...
9 createtrunk
8 moved1
7 moved1
6 moved2
5 changeb and rm d2
4 changeb and rm d2
3 moved1again
2 moved1again
1 copyfilefrompast
0 copydirfrompast
o  9 copydirfrompast files: d2/d
|
o  8 copyfilefrompast files: d
|
o  7 moved1again files: d1/b d1/c
|
| o  6 moved1again files:
| |
o |  5 changeb and rm d2 files: d1/b d2/d
| |
| o  4 changeb and rm d2 files: b
| |
o |  3 moved2 files: d2/d
| |
o |  2 moved1 files: d1/b d1/c
| |
| o  1 moved1 files: b c
|
o  0 createtrunk files:

default                        9:
d1                             6: