view tests/bzr-definitions @ 7821:9fe7e6acf525

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

Fixes issue1533.

# this file holds the definitions that are used in various bzr tests

"$TESTDIR/hghave" bzr || exit 80

echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH
echo 'hgext.graphlog = ' >> $HGRCPATH

glog()
{
    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
}

manifest()
{
    echo "% manifest of $2"
    hg -R $1 manifest -v -r $2
}