evolve: add test for the case where public divergence on difference parents This test make sure that public divergence resolution also handle the case when divergentes changeset does not share the same parent at one end because one end simply rebase. The other side has actual an actual diff change. For now this would work only for the case when we need to relocate the mutable one. Other case is still left to work on.

     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