Mercurial > hg
view tests/test-addremove-similar @ 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 | 1a96f1d9599b |
children |
line wrap: on
line source
#!/bin/sh hg init rep; cd rep touch empty-file python -c 'for x in range(10000): print x' > large-file hg addremove hg commit -m A rm large-file empty-file python -c 'for x in range(10,10000): print x' > another-file hg addremove -s50 hg commit -m B echo % comparing two empty files caused ZeroDivisionError in the past hg update -C 0 rm empty-file touch another-empty-file hg addremove -s50 cd .. hg init rep2; cd rep2 python -c 'for x in range(10000): print x' > large-file python -c 'for x in range(50): print x' > tiny-file hg addremove hg commit -m A python -c 'for x in range(70): print x' > small-file rm tiny-file rm large-file hg addremove -s50 hg commit -m B echo % should all fail hg addremove -s foo hg addremove -s -1 hg addremove -s 1e6 cd .. echo '% issue 1527' hg init rep3; cd rep3 mkdir d echo a > d/a hg add d/a hg commit -m 1 mv d/a d/b hg addremove -s80 hg debugstate mv d/b c echo "% no copies found here (since the target isn't in d" hg addremove -s80 d echo "% copies here" hg addremove -s80 true