evolvestate: store info about relocation while resolving content-divergence While resolving content-divergence when they are on different parents, we relocate one of the node to parent of another one and this can lead to conflicts sometimes. So we need to store information about that state in evolvestate so that we can use that when user does `hg evolve --continue` or `--stop` or `--abort`. Now that we make sure, we store the new other node in evolvestate, we fix the behavior of handling the relocated commit and merge the right changesets.

     1

     2

all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico

     3

	sphinx-build . ../html/

     4

     5

tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py

     6

	python test2rst.py tutorials/

     7

     8

tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py

     9

	python test2rst.py tutorials/

    10

    11

static/logo-evolve.ico: static/logo-evolve.svg

    12

	convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico

    13

    14