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 a > a
hg ci -Ama -d'0 0'
mkdir b
echo a > b/a
hg ci -Amb -d'1 0'
hg manifest
hg manifest -v
hg manifest --debug
hg manifest -r 0
hg manifest -r 1
hg manifest -r tip

echo % should fail
hg manifest -r 2
hg manifest -r tip tip

hg manifest tip