Mercurial > hg
view tests/test-merge-types @ 10716:5f92bde72eef
check-code: Only call check-code if __name__ = "__main__".
This changeset moves the code that actually executes something to the
"if __name__ = '__main__'" section to allow the file to be imported as
a module.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 16 Mar 2010 19:52:56 +0100 |
parents | 026eb80060d8 |
children |
line wrap: on
line source
#!/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