##// END OF EJS Templates
Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

File last commit:

r4645:0de7e6e2 default
r5080:73fdc8bd default
Show More
test-patch
36 lines | 681 B | text/plain | TextLexer
#!/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