evolve: store divergent nodes in evolvestate when resolving content-divergence
We need to store the divergent nodes in evolvestate so that we can continue an
interrupted phase divergence resolution.
# utility to setup pythonpath to point into the tested repositoryexportSRCDIR=`dirname$TESTDIR`if[-n"$PYTHONPATH"];thenexportHGTEST_ORIG_PYTHONPATH=$PYTHONPATHexportPYTHONPATH=$SRCDIR:$PYTHONPATHelseexportPYTHONPATH=$SRCDIRfi