Mercurial > hg
view tests/test-notify-changegroup.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 | e981725da3fe |
children | a3d73b3e1f8a |
line wrap: on
line source
% clone updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit adding a % commit % push pushing to ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Date: Subject: test-notify-changegroup/a: 2 new changesets From: test X-Hg-Notification: changeset cb9a9f314b8b Message-Id: To: baz, foo@bar changeset cb9a9f314b8b in test-notify-changegroup/a details: test-notify-changegroup/a?cmd=changeset;node=cb9a9f314b8b summary: a changeset ba677d0156c1 in test-notify-changegroup/a details: test-notify-changegroup/a?cmd=changeset;node=ba677d0156c1 summary: b diffs (6 lines): diff -r 000000000000 -r ba677d0156c1 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,2 @@ +a +a