evolve: orphans that evolve into nothing don't need successors (issue5967) When continuing to solve an orphan that created no changes (i.e. clean wdir), _completeorphan() used to create an obsmarker that said that the result of that orphan evolution is the currently checked out changeset. That's not a correct obsmarker, because all of the orphan's changes were dropped and so it had no effect on the currently checked out changeset. This is an issue that has only existed when --continu'ing evolve, that's why the fix touches _completeorphan(), but not _solveunstable(). This fix is adapted from a similar "if node is None" block in _finalizerelocate().

     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