view .hgignore @ 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.

syntax: re
/figures/[^/]+\.png$
^html/
\.pyc$
~$
\.swp$
\.orig$
\.rej$
^tests/.*\.err$
^tests/easy_run.sh$
^build/
^dist/
^MANIFEST$
^docs/tutorials/.*\.rst$
\.ico$
tests/\.testtimes

^docs/training/graphs/
^docs/training/html/
^docs/training/index.html
^docs/training/graphviz-images/
^docs/training/img/
^docs/training/output/
^docs/training/pandocfilters/