##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.
Patrick Mezard - - Load All Authors

File last commit:

r4645:0de7e6e2 default
r8165:78658990 default
Show More
test-patch
36 lines | 681 B | text/plain | TextLexer
/ tests / test-patch
History | Annotation | Raw |Copy content |Copy permalink
#!/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