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>
Sun, 24 Mar 2019 21:29:44 +0530
changeset 4443 fc2214916f50
parent 2649 cf930521f14d
child 4814 48b30ff742cb
permissions -rw-r--r--
evolve: add condition in case of pubdiv to not swap the two div csets In public divergence, we have pinned the public cset to the local side when merge is performed. And in divergence resolution implementation divergent cset is the one who is kept at the local side, so to say this in one line: we have pinned public cset to the divergent side. However, in some cases we need to swap the "divergent" and "other" but we can't swap them in case of public divergence as thought would cause an error because of not being able to relocate public cset.
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