Mercurial > evolve

changeset 5785:a9ad01ed1539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: drop a block of code which is unnecessary now Now, it is already covered by parent div resolution so removing it.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 17 Feb 2021 18:11:44 +0530
parents 43a5371fa669
children c0122b98356c
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 1 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Feb 18 23:37:41 2021 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Feb 17 18:11:44 2021 +0530
@@ -405,22 +405,7 @@
             gca = [nodemod.nullrev]
         else:
             gca = repo.revs(b"ancestor(%d, %d)" % (succsotherp1, succsdivp1))
-
-        if succsotherp1 in gca and succsdivp1 in gca:
-            # both are not on the same parent but have same parents's succs.
-            if otheronly and divonly:
-                # case: we have visible csets on both side diverging from
-                # tca of "divergent" and "other". We still need to decide what
-                # to do in this case
-                pass
-            if otheronly:
-                resolutionparent = succsotherp1
-            elif divonly:
-                pass
-            else:
-                # no extra cset on either side
-                pass
-        elif succsotherp1 in gca and succsdivp1 not in gca:
+        if succsotherp1 in gca and succsdivp1 not in gca:
             pass
         elif succsdivp1 in gca and succsotherp1 not in gca:
             resolutionparent = succsotherp1