evolve: make sure divergence resolution doesn't undo changes (issue6203) Before this patch, in content-divergence resolution logic if resolution parent is not the parent of any of the two divergent changesets then it could undo some changes introduced by previous revs (while resolving stack of content-divergent changesets) as demonstrated by the test added in previous patch. To solve this, what this patch doing is: if divergent cset has obsolete parent with a successor then first resolve the "orphan" instability of divergent cset by relocating, then perform the content-divergence resolution. After this change in logic, I found that it's kind of more correct as reflected by the changes in tests/test-evolve-content-divergent-corner-cases.t where it prevented creating conflicts while merging. Changes in tests/test-evolve-content-divergent-stack.t demonstrate the fixed behaviour. Next patches will be covering the `evolve --continue` case for the relocation of "divergent" cset.

     1

SPHINXBUILD ?= sphinx-build

     2

     3

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

     4

	$(SPHINXBUILD) . ../html/

     5

     6

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

     7

	python test2rst.py tutorials/

     8

     9

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

    10

	python test2rst.py tutorials/

    11

    12

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

    13

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