Mercurial > evolve

changeset 5783:c5c879fed91c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: add comments to explain a particular case
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 01 Feb 2021 23:54:53 +0530
parents 72f65a647203
children 43a5371fa669
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Fri Jan 22 05:37:43 2021 +0100
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Feb 01 23:54:53 2021 +0530
@@ -377,7 +377,12 @@
         # both are in parent-child relation
         pass
     elif succsbasep1 in (succsdivp1, succsotherp1):
-        # only one side moved, set parent of moved one as resolution parent
+        # 1) either, only one side moved
+        #                -> set parent of moved one as resolution parent
+        # 2) or, both moved but one moved to succs of basep1
+        #                -> set parent of other one as resolution parent
+        # 3) or, both have same parent's successor
+        #                -> set parent's successor as resolution parent
         if succsbasep1 == succsdivp1:
             resolutionparent = succsotherp1
         else: