1 #!/bin/sh

     2 

     3 hg init

     4 echo a > a

     5 hg ci -Amadd

     6 

     7 chmod +x a

     8 hg ci -mexecutable

     9 

    10 hg up 0

    11 rm a

    12 ln -s symlink a

    13 hg ci -msymlink

    14 

    15 hg merge

    16 

    17 echo % symlink is left parent, executable is right

    18 

    19 if [ -L a ]; then

    20     echo a is a symlink

    21     readlink a

    22 elif [ -x a ]; then

    23     echo a is executable

    24 fi

    25 

    26 hg update -C 1

    27 hg merge

    28 

    29 echo % symlink is right parent, executable is left

    30 

    31 if [ -L a ]; then

    32     echo a is a symlink

    33     readlink a

    34 elif [ -x a ]; then

    35     echo a is executable

    36 fi