Mercurial > hg
view tests/test-incoming-outgoing @ 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 | fece056bf240 |
children | d4a62b6d4a58 |
line wrap: on
line source
#!/bin/sh mkdir test cd test hg init for i in 0 1 2 3 4 5 6 7 8; do echo $i >> foo hg commit -A -m $i -d "1000000 0" done hg verify hg serve -p $HGPORT -d --pid-file=hg.pid cat hg.pid >> $DAEMON_PIDS cd .. hg init new # http incoming http_proxy= hg -R new incoming http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,' http_proxy= hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,' # local incoming hg -R new incoming test hg -R new incoming -r 4 test echo "% limit to 2 changesets" hg -R new incoming -l 2 test echo "% limit to 2 changesets, test with -p --git" hg -R new incoming -l 2 -p --git test # test with --bundle http_proxy= hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,' hg -R new incoming --bundle test2.hg test # test the resulting bundles hg init temp hg init temp2 hg -R temp unbundle test.hg hg -R temp2 unbundle test2.hg hg -R temp tip hg -R temp2 tip rm -r temp temp2 new # test outgoing hg clone test test-dev cd test-dev for i in 9 10 11 12 13; do echo $i >> foo hg commit -A -m $i -d "1000000 0" done hg verify cd .. hg -R test-dev outgoing test echo "% limit to 3 changesets" hg -R test-dev outgoing -l 3 test http_proxy= hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,' http_proxy= hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'