evolvecmd: use the evolvestate object passed as argument in _solveunstable Earlier if get a merge conflict, we used to initialize a new evolvestate object and used to save it. Let's start using the state object which we get in as argument as that will contain more data about the state.

     1

# utility to setup pythonpath to point into the tested repository

     2

     3

export SRCDIR=`dirname $TESTDIR`

     4

if [ -n "$PYTHONPATH" ]; then

     5

    export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH

     6

    export PYTHONPATH=$SRCDIR:$PYTHONPATH

     7

else

     8

    export PYTHONPATH=$SRCDIR

     9

fi