Mercurial > evolve
changeset 5575:5c62afe34c96
evolve: update some comments
Removing "not considering relocation" part as now it's depend on,
if divergent and other are direct children of resolution parent
or not.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Thu, 20 Aug 2020 23:54:27 +0530 |
| parents | e6241483ccec |
| children | b4c2cbbde6bd |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Fri Aug 21 01:04:08 2020 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Thu Aug 20 23:54:27 2020 +0530 @@ -302,7 +302,7 @@ return (False, b".") if not (divergent.mutable() and other.mutable()): - # for simplicity, we keep public one to local side while merging + # Public divergence: we keep public one to local side while merging sameparent = divergent.p1().rev() == other.p1().rev() # When public branch is behind to the mutable branch, for now we # relocate mutable cset to public one's side in every case. @@ -393,7 +393,7 @@ elif divonly: pass else: - # no extra cset on either side; so not considering relocation + # no extra cset on either side pass elif succsotherp1 in gca and succsdivp1 not in gca: pass @@ -523,7 +523,7 @@ evolvestate[b'divergent'] = newdivergent divergent = repo[newdivergent] - # relocate the other divergent if required + # relocate the other divergent to resolution parent if evolvestate[b'relocate-other']: # relocating will help us understand during the time of conflicts that # whether conflicts occur at reloacting or they occured at merging