Mercurial > evolve

annotate docs/makefile @ 3809:f06ff8fee2f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvestate: store info about relocation while resolving content-divergence While resolving content-divergence when they are on different parents, we relocate one of the node to parent of another one and this can lead to conflicts sometimes. So we need to store information about that state in evolvestate so that we can use that when user does `hg evolve --continue` or `--stop` or `--abort`. Now that we make sure, we store the new other node in evolvestate, we fix the behavior of handling the relocated commit and merge the right changesets.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 07 Jun 2018 18:18:10 +0530
parents 1a4f26eec0af
children 150be007f421
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
1
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
2 all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
242
1fc4299ca8e2 [doc] change doc generation directory
Pierre-Yves.David@ens-lyon.org
parents: 235
diff changeset
3 sphinx-build . ../html/
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
4
2960
1a4f26eec0af test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2824
diff changeset
5 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
6 python test2rst.py tutorials/
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
7
2960
1a4f26eec0af test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2824
diff changeset
8 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
9 python test2rst.py tutorials/
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
10
558
11c5f734d64e docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 557
diff changeset
11 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
12 convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
13
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
14