author | Matt Mackall <mpm@selenic.com> |
Wed, 07 Nov 2007 14:38:04 -0600 | |
changeset 5509 | 305b035c5fda |
parent 5503 | 6f26c7677463 |
child 5682 | 048889f8c7d1 |
permissions | -rwxr-xr-x |
#!/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