diff hgext3rd/evolve/evolvecmd.py @ 5818:524eb673ac52

divergence-resolution: update some comments

--- a/hgext3rd/evolve/evolvecmd.py	Mon Feb 01 23:56:34 2021 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Feb 02 00:05:19 2021 +0530
@@ -348,16 +348,13 @@
     # testing how both the divergent changesets are arranged, there can be 4
     # possible cases here:
     #
-    # 1) both have the same parents
-    # 2) both have different parents but greatest common anscestor of them is
-    #    parent of one of them
-    # 3) both have different parents and gca is not parent of any of them
-    # 4) one of them is parent of other
+    # 1) both have the same parent (or parent's successor)
+    # 2) one of them is parent of other
+    # 3) one of them moved elsewhere
+    # 4) both of them moved elsewhere
     #
-    # we are handling 1) very good now.
-    # for 2) we will relocate one which is behind to the parent of ahead one and
-    # then solve the content-divergence the way we solve 1)
-    # for 3) and 4), we still have to decide
+    # we are handling 1) 2) 3) very well now.
+    # for 4), we still have to decide
     if otherp1 == divp1:
         # both are on the same parents
         pass