Mercurial > evolve
annotate docs/makefile @ 4935:3874bc10d4a7 stable
docs: add two more amend commits to simulate temporary amend commits
sharing.rst made reference to temporary amend commits and used them to
demonstrate that hidden commits are not exchanged. Nowadays, evolve doesn't
create such commits, but it still makes sense to show how they are handled
during the exchange process. So let's add two more amend commits, one for each
repo. This way the guide doesn't have to be updated too much, but doesn't lose
this important detail of working with evolve.
Unfortunately, this means that tons of hashes change, but it's better than to
have figure 4 demonstrate absolutely nothing.
Temporary amend commits were removed from test-sharing.t in 06844693bb21,
but sharing.rst continued using them for demonstration purposes. It might've
been better to replace at least some of the temporary amend commits by extra
amends back then, but oh well.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 11 Nov 2019 02:42:37 +0700 |
parents | 150be007f421 |
children | 77729ad7cb0c |
rev | line source |
---|---|
4631
150be007f421
docs: add SPHINXBUILD make variable
Faheem Mitha <faheem@faheem.info>
parents:
2960
diff
changeset
|
1 SPHINXBUILD ?= sphinx-build |
233 | 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 | 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 |