Mercurial > hg
view tests/test-merge10 @ 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 | 8766fee6f225 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb # (merge correctly when all the files in a directory are moved # but then local changes are added in the same directory) hg init a cd a mkdir -p testdir echo a > testdir/a hg add testdir/a hg commit -d '1000000 0' -m a cd .. hg clone a b cd a echo alpha > testdir/a hg commit -d '1000000 0' -m remote-change cd .. cd b mkdir testdir/subdir hg mv testdir/a testdir/subdir/a hg commit -d '1000000 0' -m move mkdir newdir echo beta > newdir/beta hg add newdir/beta hg commit -d '1000000 0' -m local-addition hg pull ../a hg up -C 2 hg merge hg stat hg diff --nodates