evolve: in pubdiv resolution make sure that transaction get closed
Before this patch it could be possible that transaction won't get
closed if res is False in the pubic divergence resolution when
continuing the hg evolve.
# utility to setup pythonpath to point into the tested repository
export SRCDIR="`dirname $TESTDIR`"
if [ -n "$PYTHONPATH" ]; then
export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH
if uname -o | grep -q Msys; then
export PYTHONPATH="$SRCDIR;$PYTHONPATH"
else
export PYTHONPATH=$SRCDIR:$PYTHONPATH
fi
else
export PYTHONPATH=$SRCDIR
fi