Mercurial > evolve

view docs/makefile @ 5175:307bb57ff2ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adapt now that Mercurial clears the merge state for empty wdir `hg evolve` forgot to clear the merge state when its attempt to commit resulted in no commit because the working copy had no changes. That resulted in test-evolve-issue5967.t showing a conflict state that shouldn't be there. The responsibility for clearing the merge state was moved into Mercurial in Mercurial in 6a34e438461b (commit: clear resolved mergestate even if working copy is clean, 2020-02-28), so the bug is now fixed in `hg evolve`, which impacts that test case. CORE-TEST-OUTPUT-UPDATE: 6a34e438461b
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 04 Mar 2020 15:21:32 -0800
parents 150be007f421
children 77729ad7cb0c
line wrap: on
line source

SPHINXBUILD ?= sphinx-build

all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
	$(SPHINXBUILD) . ../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