Mercurial > hg
view tests/test-status.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 | acc40572da5b |
children | 54cd28258ea7 |
line wrap: on
line source
hg status in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in repo root: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status in a: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a: ? 1/in_a_1 ? in_a hg status .. in a: ? 1/in_a_1 ? in_a ? ../b/1/in_b_1 ? ../b/2/in_b_2 ? ../b/in_b ? ../in_root hg status in b: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b: ? 1/in_b_1 ? 2/in_b_2 ? in_b hg status .. in b: ? ../a/1/in_a_1 ? ../a/in_a ? 1/in_b_1 ? 2/in_b_2 ? in_b ? ../in_root hg status in a/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in a/1: ? in_a_1 hg status .. in a/1: ? in_a_1 ? ../in_a hg status in b/1: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/1: ? in_b_1 hg status .. in b/1: ? in_b_1 ? ../2/in_b_2 ? ../in_b hg status in b/2: ? a/1/in_a_1 ? a/in_a ? b/1/in_b_1 ? b/2/in_b_2 ? b/in_b ? in_root hg status . in b/2: ? in_b_2 hg status .. in b/2: ? ../1/in_b_1 ? in_b_2 ? ../in_b adding .hgignore adding deleted adding modified adding removed hg status: A added R removed ! deleted ? unknown hg status modified added removed deleted unknown never-existed ignored: never-existed: No such file or directory A added R removed ! deleted ? unknown hg status -C: A added A copied modified R removed ! deleted ? unknown hg status -A: A added A copied modified R removed ! deleted ? unknown I ignored C .hgignore C modified hg status ignoreddir/file: hg status -i ignoreddir/file: I ignoreddir/file adding .hgignore adding deleted adding modified adding removed