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>
Thu, 28 Feb 2019 03:12:39 +0530
changeset 4417 b86413cfca4a
parent 2649 cf930521f14d
child 4814 48b30ff742cb
permissions -rw-r--r--
evolve: cover continue case in pubdiv when merging results in same as public This patch is the part of a series which is adding support of public divergence resolution of the case when merging results in same as pubic cset. Changes made in this patch cover the --continue flag for the case: when we had conflicts in merging. Modified lines in previously added tests reflects the changed behaviour. Also added some additional tests. I guess I have covered every possbile case in test-evolve-public-content-divergent.t While reviewing, if you see any test missed please let me know. (I think there is one test missed that I will send as a follow-up)
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