view tests/test-symlink-addremove @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

"$TESTDIR/hghave" symlink || exit 80

hg init a
cd a

echo '% directory moved and symlinked'
mkdir foo
touch foo/a
hg ci -Ama
mv foo bar
ln -s bar foo
echo '% now addremove should remove old files'
hg addremove