view tests/test-convert-hg-svn.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 0750f11152fe
children ea26ac58bbe3
line wrap: on
line source

Checked out revision 0.
A         a
Adding         a
Transmitting file data .
Committed revision 1.
% initial roundtrip
scanning source...
sorting...
converting...
0 added a
scanning source...
sorting...
converting...
% second roundtrip should do nothing
scanning source...
sorting...
converting...
scanning source...
sorting...
converting...
% new hg rev
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% echo hg to svn
scanning source...
sorting...
converting...
0 b
% svn back to hg should do nothing
scanning source...
sorting...
converting...
% hg back to svn should do nothing
scanning source...
sorting...
converting...