# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1597305489 -19800
# Node ID 742c8202d5566c49c8d6ccd79c22d98eaad8e0f3
# Parent  c61a31489da00c0160f811aae0fac7f64b030211
evolve: update some comments acc. to upcoming behavior

diff -r c61a31489da0 -r 742c8202d556 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Wed Aug 12 17:30:18 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Aug 13 13:28:09 2020 +0530
@@ -324,12 +324,11 @@
         evolvestate[b'other-divergent'] = other.node()
         return div, other
 
-    # haspublicdiv: to keep track if we are solving public content-divergence
+    # keep track if we are solving public content-divergence
     haspublicdiv = False
     if not (divergent.mutable() and other.mutable()):
         haspublicdiv = True
         # for simplicity, we keep public one to local side while merging
-        # (as divergent is kept at local side, pinning public -> divergent)
         if divergent.mutable():
             publicdiv = other
             divergent, other = swapnodes(divergent, other)