Mercurial > hg
view tests/test-merge-types @ 7468:3e5db4228f8f
rebase: add support to keep branch names
Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Tue, 18 Nov 2008 21:46:01 -0600 |
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