Mercurial > hg
view tests/test-merge-types @ 11999:62e2bbf523f2
revlog: generate full revisions when parent node is missing
The full revision is sent if the first parent, against which diff is calculated, is
missing at remote. This happens in the case of shallow clones.
author | Vishakh H <vsh426@gmail.com> |
---|---|
date | Fri, 13 Aug 2010 19:41:51 +0530 |
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