Mercurial > evolve

changeset 5555:742c8202d556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: update some comments acc. to upcoming behavior
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Thu, 13 Aug 2020 13:28:09 +0530
parents c61a31489da0
children 1bb1d36e1bc2
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)