Mercurial > evolve

view docs/makefile @ 4483:7978230faa32 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: make sure div resolution don't replace the initial author (issue6113) Before this patch, divergence resolution logic taking the current user who is running the resolution command as the author of commit that will be created after merging the two divergent csets. This patch make sure that we preserve the initial author. Changes in test file reflect the fixed behaviour.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 10 Apr 2019 15:37:29 +0200
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