Mercurial > hg
view tests/test-patch @ 8819:e93ab347c814
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong
This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails. Failure is more frequent with faster hardware.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | 0de7e6e27fe4 |
children |
line wrap: on
line source
#!/bin/sh cat > patchtool.py <<EOF import sys print 'Using custom patch' if '--binary' in sys.argv: print '--binary found !' EOF echo "[ui]" >> $HGRCPATH echo "patch=python ../patchtool.py" >> $HGRCPATH hg init a cd a echo a > a hg commit -Ama -d '1 0' echo b >> a hg commit -Amb -d '2 0' cd .. # This test check that: # - custom patch commands with arguments actually works # - patch code does not try to add weird arguments like # --binary when custom patch commands are used. For instance # --binary is added by default under win32. echo % check custom patch options are honored hg --cwd a export -o ../a.diff tip hg clone -r 0 a b hg --cwd b import -v ../a.diff