##// END OF EJS Templates
subrepo: change default path in hgrc of subrepo after cloning...
subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

File last commit:

r7080:a6477aa8 default
r10378:e1401c74 default
Show More
test-merge-symlinks
46 lines | 986 B | text/plain | TextLexer
/ tests / test-merge-symlinks
Patrick Mezard
Test *_ISLINK merge environment vars
r5391 #!/bin/sh
cat > echo.py <<EOF
#!/usr/bin/env python
Patrick Mezard
tests: Windows compatibility fixes...
r7080 import os, sys
try:
import msvcrt
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
except ImportError:
pass
Patrick Mezard
Test workingctx exec/link bit for copies....
r5408 for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
Patrick Mezard
Test *_ISLINK merge environment vars
r5391 print k, os.environ[k]
EOF
# Create 2 heads containing the same file, once as
Patrick Mezard
Test workingctx exec/link bit for copies....
r5408 # a file, once as a link. Bundle was generated with:
#
# hg init t
# cd t
# echo a > a
# hg ci -qAm t0 -d '0 0'
# echo l > l
# hg ci -qAm t1 -d '1 0'
# hg up -C 0
# ln -s a l
# hg ci -qAm t2 -d '2 0'
# echo l2 > l2
# hg ci -qAm t3 -d '3 0'
Patrick Mezard
Test *_ISLINK merge environment vars
r5391 hg init t
cd t
Patrick Mezard
Test workingctx exec/link bit for copies....
r5408 hg -q pull "$TESTDIR/test-merge-symlinks.hg"
hg up -C 3
Patrick Mezard
Test *_ISLINK merge environment vars
r5391
# Merge them and display *_ISLINK vars
echo % merge heads
Patrick Mezard
Test workingctx exec/link bit for copies....
r5408 HGMERGE="python ../echo.py" hg merge
# Test working directory symlink bit calculation wrt copies,
# especially on non-supporting systems.
echo % merge working directory
hg up -C 2
hg copy l l2
HGMERGE="python ../echo.py" hg up 3