Mercurial > hg
view tests/test-merge-types @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 05 Mar 2008 09:10:45 -0800 |
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