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.
#!/bin/sh
. $TESTDIR/testlib/pythonpath.sh
# This file holds logic that is used in many tests.
# It can be called in a test like this:
# $ . "$TESTDIR/testlib/topic_setup.sh"
# Enable obsolete markers and enable extensions
cat >> $HGRCPATH << EOF
[experimental]
evolution=createmarkers,exchange
[extensions]
rebase=
topic=
EOF