tests/test-merge-types
author Gilles Moris <gilles.moris@free.fr>
Fri, 06 Nov 2009 09:35:38 +0100
changeset 9811 c92ac5a56f69
parent 5710 026eb80060d8
permissions -rwxr-xr-x
buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.

#!/bin/sh

hg init
echo a > a
hg ci -Amadd       # 0

chmod +x a
hg ci -mexecutable # 1

hg up 0
rm a
ln -s symlink a
hg ci -msymlink    # 2
hg merge --debug

echo % symlink is local parent, executable is other

if [ -h a ]; then
    echo a is a symlink
    $TESTDIR/readlink.py a
elif [ -x a ]; then
    echo a is executable
else
    echo "a has no flags (default for conflicts)"
fi

hg update -C 1
hg merge --debug

echo % symlink is other parent, executable is local

if [ -h a ]; then
    echo a is a symlink
    $TESTDIR/readlink.py a
elif [ -x a ]; then
    echo a is executable
else
    echo "a has no flags (default for conflicts)"
fi