Mercurial > hg
view tests/test-bisect @ 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 | 2b35ced86b69 |
children | 807633f1e3c2 |
line wrap: on
line source
#!/bin/sh set -e echo % init hg init echo % committing changes count=0 echo > a while test $count -lt 32 ; do echo 'a' >> a test $count -eq 0 && hg add hg ci -m "msg $count" -d "$count 0" echo % committed changeset $count count=`expr $count + 1` done echo % log hg log echo % hg up -C hg up -C echo % bisect test hg bisect -r hg bisect -b hg bisect -g 1 hg bisect -g echo skip hg bisect -s hg bisect -g hg bisect -g hg bisect -b hg bisect -g echo % bisect reverse test hg bisect -r hg bisect -b null hg bisect -g tip hg bisect -g echo skip hg bisect -s hg bisect -g hg bisect -g hg bisect -b hg bisect -g hg bisect -r hg bisect -g tip hg bisect -b tip || echo error hg bisect -r hg bisect -g null hg bisect -bU tip hg id echo % reproduce AssertionError, issue1228 and issue1182 hg bisect -r hg bisect -b 4 hg bisect -g 0 hg bisect -s hg bisect -s hg bisect -s echo % reproduce non converging bisect, issue1182 hg bisect -r hg bisect -g 0 hg bisect -b 2 hg bisect -s echo % test no action hg bisect -r hg bisect || echo failure echo % reproduce AssertionError, issue1445 hg bisect -r hg bisect -b 6 hg bisect -g 0 hg bisect -s hg bisect -s hg bisect -s hg bisect -s hg bisect -g set +e echo % test invalid command hg bisect -r hg bisect --command 'foobar' echo % test bisecting command cat > script.py <<EOF #!/usr/bin/env python import sys from mercurial import ui, hg repo = hg.repository(ui.ui(), '.') if repo['.'].rev() < 6: sys.exit(1) EOF chmod +x script.py hg bisect -r hg bisect --good tip hg bisect --bad 0 hg bisect --command "`pwd`/script.py" true