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 Sushil khanchi <sushilkhanchi97@gmail.com>
Fri, 22 Feb 2019 23:49:37 +0530
changeset 4407 7fd0cbf6190d
parent 2649 cf930521f14d
child 4814 48b30ff742cb
permissions -rw-r--r--
evolve: change in a test which demonstrate divergence resolution can break This patch just add "--any" flag to "hg evolve --content-divergent" in a test and changed output reflect that there is something which is not handled correctly. After looking into code I found that it is because of using a evolvestate value which is not updated i.e evolvestate['divergent'] Next patch will fix this problem.
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