Mercurial > evolve
view docs/makefile @ 3772:6240579fd0c0
evolve: fix storage of replacements and temprevs node in evolvestate
The _completephaseivergent() was not respecting rules on how to store the new
node ids created in evolvestate. The rules are:
* store the temporary relocated commits in temprevs
* store the final new commit in replacements
This patch make sure we follow the above rules and also use the return value
returned by _resolvephasedivergence().
The tests change demonstrates that we are all good now.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 24 May 2018 00:58:50 +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