# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1597947867 -19800
# Node ID 5c62afe34c9689f5deae12875a81f833686fadb3
# Parent  e6241483ccecd38652e3d48485b068c62638aad8
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.

diff -r e6241483ccec -r 5c62afe34c96 hgext3rd/evolve/evolvecmd.py
--- 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