tests/test-merge-types
author Matt Mackall <mpm@selenic.com>
Wed, 02 Apr 2008 18:47:17 -0500
changeset 6452 d93f2f39bef4
parent 5710 026eb80060d8
permissions -rwxr-xr-x
coal: more tweaks - add revision numbers to changeset, browse, and file pages - add revision number to revision number navigator in log - remove node from log and filelog pages - add changeset, browse, and archive buttons back to log page - make buttons more clickable with display: block - fix alignment of some table heads

#!/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