merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.

#!/bin/sh

hg init
echo 123 > a
hg add a
hg commit -m "first" -d "1000000 0" a
mkdir sub
echo 321 > sub/b
hg add sub/b
hg commit -m "second" -d "1000000 0" sub/b
cat sub/b
hg co 0
cat sub/b 2>/dev/null || echo "sub/b not present"
test -d sub || echo "sub not present"

true