Mercurial > evolve
changeset 5556:1bb1d36e1bc2
evolve: move a comment where it's going to belong
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Thu, 13 Aug 2020 13:30:25 +0530 |
| parents | 742c8202d556 |
| children | ca45afafd94f |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Thu Aug 13 13:28:09 2020 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Thu Aug 13 13:30:25 2020 +0530 @@ -329,6 +329,14 @@ if not (divergent.mutable() and other.mutable()): haspublicdiv = True # for simplicity, we keep public one to local side while merging + # When public branch is behind to the mutable branch, for now we + # relocate mutable cset to public one's side in every case. + # + # This behaviour might be sub optimal when ancestors of mutable + # cset has changes its relocated descendant rely on. + # + # Otherwise, we are going to rebase the "behind" branch up to the new + # brancmap level. if divergent.mutable(): publicdiv = other divergent, other = swapnodes(divergent, other) @@ -419,14 +427,6 @@ elif succsdivp1 in gca and succsotherp1 not in gca: relocatereq = True - # When public branch is behind to the mutable branch, for now we - # relocate mutable cset to public one's side in every case. - # - # This behaviour might be sub optimal when ancestors of mutable - # cset has changes its relocated descendant rely on. - # - # Otherwise, we are going to rebase the "behind" branch up to the new - # brancmap level. if not haspublicdiv: divergent, other = swapnodes(divergent, other) resolutionparent = divergent.p1().node()