##// END OF EJS Templates
Use common readlink.py instead of own implementations per test script.
Use common readlink.py instead of own implementations per test script.

File last commit:

r5683:396c7010 default
r5683:396c7010 default
Show More
test-merge-types
36 lines | 495 B | text/plain | TextLexer
#!/bin/sh
hg init
echo a > a
hg ci -Amadd
chmod +x a
hg ci -mexecutable
hg up 0
rm a
ln -s symlink a
hg ci -msymlink
hg merge
echo % symlink is left parent, executable is right
if [ -h a ]; then
echo a is a symlink
$TESTDIR/readlink.py a
elif [ -x a ]; then
echo a is executable
fi
hg update -C 1
hg merge
echo % symlink is right parent, executable is left
if [ -h a ]; then
echo a is a symlink
$TESTDIR/readlink.py a
elif [ -x a ]; then
echo a is executable
fi