mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
40 lines
643 B
Bash
Executable File
40 lines
643 B
Bash
Executable File
#!/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
|