view tests/test-issue1175.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 03916abdfb64
children f2618cacb485
line wrap: on
line source

adding a
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
warning: detected divergent renames of a to:
 a2
 a1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding a
b
 b: searching for copy revision for a
 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
committed changeset 5:755e75751bf67eb4378bca61987df035d90a7a06
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 6 changesets, 4 total revisions
# HG changeset patch
# User test
# Date 0 0
# Node ID 755e75751bf67eb4378bca61987df035d90a7a06
# Parent  7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d
5

diff --git a/b b/b
new file mode 100644