Mercurial > hg

view tests/test-mq-qgoto.out @ 8810:ac92775b3b80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fb32ae9c76e7
children 561ff8d9e4f0
line wrap: on
line source

adding a
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
now at: b.patch

% Using index
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch

% No warnings when using index
now at: b.patch
applying c.patch
applying bug314159
now at: bug314159

% Detect ambiguous non-index
patch name "14" is ambiguous:
  bug314159
  bug141421
abort: patch 14 not in series