evolve: introduce a resolutionparent variable and store it in evolvestate
This patch introduces a resolutionparent variable which will be the parent of
final changeset after resolving content-divergent changesets.
Till now, the parent is always the parent of one of the divergent node, but now
in upcoming cases, it can be a successor of both the parents of divergent nodes.
all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
sphinx-build . ../html/
tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
python test2rst.py tutorials/
tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py
python test2rst.py tutorials/
static/logo-evolve.ico: static/logo-evolve.svg
convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico