Mercurial > evolve

view docs/makefile @ 3848:90f1a64875ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: introduce a resolutionparent variable and store it in evolvestate This patch introduces a resolutionparent variable which will be the parent of final changeset after resolving content-divergent changesets. Till now, the parent is always the parent of one of the divergent node, but now in upcoming cases, it can be a successor of both the parents of divergent nodes.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 14 Jun 2018 01:06:12 +0530
parents 1a4f26eec0af
children 150be007f421
line wrap: on
line source


all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
	sphinx-build . ../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