Mercurial > hg
view tests/test-merge-types @ 5556:61fdf2558c0a
convert: some tidyups, doc improvements, and test fixes
The various back end options are now documented.
The hg source can now be configured not to hand out a revision ID.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 27 Nov 2007 09:44:09 -0800 |
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