Mercurial > hg
view tests/test-merge-types @ 5683:396c7010b0cd
Use common readlink.py instead of own implementations per test script.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 21 Dec 2007 10:24:03 +0100 |
parents | 048889f8c7d1 |
children | 57d29a45ffbc |
line wrap: on
line source
#!/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 [ -h a ]; then echo a is a symlink $TESTDIR/readlink.py 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 [ -h a ]; then echo a is a symlink $TESTDIR/readlink.py a elif [ -x a ]; then echo a is executable fi