evolve: cover the orphanmerge part missed by lastsolved
Let's cover the orphanmerge part also as it was missed
at the time when we introduced "lastsolved".
Chagnes in test-evolve.t reflect the fixed behaviour.
# 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