evolve: extract function for solving one revision, including merges
Will make the next patch simpler.
# utility to setup pythonpath to point into the tested repositoryexportSRCDIR=`dirname$TESTDIR`if[-n"$PYTHONPATH"];thenexportHGTEST_ORIG_PYTHONPATH=$PYTHONPATHexportPYTHONPATH=$SRCDIR:$PYTHONPATHelseexportPYTHONPATH=$SRCDIRfi