Mercurial > hg
view tests/test-bookmarks-rebase.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 | 42cb14f20d76 |
children | c7dbd6c4877a |
line wrap: on
line source
% initialize repository adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding c created new head adding d % bookmark list * two 3:2ae46b1d99a7 one 1:925d80f479bb % rebase saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) rebase completed changeset: 3:9163974d1cb5 tag: tip tag: two tag: one parent: 1:925d80f479bb parent: 2:db815d6d32e6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 3 changeset: 2:db815d6d32e6 parent: 0:f7b1eb17ad24 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 2 changeset: 1:925d80f479bb user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 1 changeset: 0:f7b1eb17ad24 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 0