sapling/tests/test-merge-types
Bryan O'Sullivan 6605c95531 Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
2007-11-02 14:02:28 -07:00

37 lines
471 B
Bash
Executable File

#!/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 [ -L a ]; then
echo a is a symlink
readlink 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 [ -L a ]; then
echo a is a symlink
readlink a
elif [ -x a ]; then
echo a is executable
fi