# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1613565704 -19800
# Node ID a9ad01ed1539d814baac6e79618727c57b79eb71
# Parent  43a5371fa6693219db0f412735d947a8848f85d3
divergence-resolution: drop a block of code which is unnecessary now

Now, it is already covered by parent div resolution so removing it.

diff -r 43a5371fa669 -r a9ad01ed1539 hgext3rd/evolve/evolvecmd.py
--- 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