view tests/test-issue1438 @ 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

rm -rf a
hg init a
cd a

ln -s foo link
hg add link
hg ci -mbad link
hg rm link
hg ci -mok
hg diff -g -r 0:1 > bad.patch
hg up 0
hg import --no-commit bad.patch
hg st