Mercurial > hg
view tests/test-merge-types @ 5529:5499dbb445de
convert: fix util.popen regression in darcs converter
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 10 Nov 2007 17:09:56 +0100 |
parents | 6f26c7677463 |
children | 048889f8c7d1 |
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 [ -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