Mercurial > hg
view tests/test-identify.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 | af6a63438a8a |
children | a4fbbe0fbc38 |
line wrap: on
line source
% no repo abort: There is no Mercurial repository here (.hg not found) % create repo adding a % basic id usage cb9a9f314b8b tip cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b tip cb9a9f314b8b cb9a9f314b8b tip % with options cb9a9f314b8b tip 0 tip default cb9a9f314b8b cb9a9f314b8b 0 default tip % with modifications cb9a9f314b8b+ 0+ default tip % other local repo cb9a9f314b8b+ tip cb9a9f314b8b+ tip % with remote http repo cb9a9f314b8b % remote with tags? abort: can't query remote revision number, branch, or tags