evolve: test a common case of public divergence
evolve: in pubdiv, handle the case when public branch is behind the mutable
In public divergence, when public branch is behind the mutable one the behaviour
that this patch added is that we relocate the draft one to public side.
This should be fine in most case, but might be an issue in some other (eg, when
the draft side of the divergence is rebase away from ancestors it relies on.)
Test written by Pierre-Yves David <pierre-yves.david@octobus.net>
# 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