Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/topic/constants.py
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 24 May 2018 00:58:50 +0530
changeset 3772 6240579fd0c0
parent 2649 cf930521f14d
child 4814 48b30ff742cb
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1845
24d8053020a2 constants: extract key for extra into a constant
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
extrakey = 'topic'
2649
cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle
Pulkit Goyal <7895pulkit@gmail.com>
parents: 1901
diff changeset 
     2
 
changekey = '_rewrite_noise'
evolve