test-merge-types
39 lines
| 553 B
| text/plain
|
TextLexer
/ tests / test-merge-types
|
r5503 | #!/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 | ||||
|
r5682 | if [ -h a ]; then | ||
|
r5503 | echo a is a symlink | ||
|
r5683 | $TESTDIR/readlink.py a | ||
|
r5503 | elif [ -x a ]; then | ||
echo a is executable | ||||
fi | ||||
hg update -C 1 | ||||
hg merge | ||||
echo % symlink is right parent, executable is left | ||||
|
r5682 | if [ -h a ]; then | ||
|
r5503 | echo a is a symlink | ||
|
r5683 | $TESTDIR/readlink.py a | ||
|
r5503 | elif [ -x a ]; then | ||
echo a is executable | ||||
fi | ||||
|
r5685 | |||
echo "skipped: test is for a known, unfixed bug" | ||||
exit 80 | ||||