Mercurial > evolve

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4631
150be007f421 docs: add SPHINXBUILD make variable
Faheem Mitha <faheem@faheem.info>
parents: 2960
diff changeset
1 SPHINXBUILD ?= sphinx-build
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
2
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
3 all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
4631
150be007f421 docs: add SPHINXBUILD make variable
Faheem Mitha <faheem@faheem.info>
parents: 2960
diff changeset
4 $(SPHINXBUILD) . ../html/
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
5
2960
1a4f26eec0af test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2824
diff changeset
6 tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
235
8469ccb9550f [doc] add `.t` to `.rst` converteur
Pierre-Yves.David@ens-lyon.org
parents: 233
diff changeset
7 python test2rst.py tutorials/
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
8
2960
1a4f26eec0af test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2824
diff changeset
9 tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
10 python test2rst.py tutorials/
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
11
558
11c5f734d64e docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 557
diff changeset
12 static/logo-evolve.ico: static/logo-evolve.svg
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
13 convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico