evolve: continue conflicted relocation content-divergence
This patch adds logic to continue an conflicted content-divergence resolution
which was interrupted while relocating one of the divergent commits.
The tests shows the there is some mishandling of copies internally which will be
fixed in next patch.
# utility to setup pythonpath to point into the tested repository
export SRCDIR=`dirname $TESTDIR`
if [ -n "$PYTHONPATH" ]; then
export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH
export PYTHONPATH=$SRCDIR:$PYTHONPATH
else
export PYTHONPATH=$SRCDIR
fi