# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1577645649 -19800
# Node ID 91285cff4b7058ce550186aeda3654749c91469b
# Parent  6f5e6253324fde7c97f7e5ac314db534793f8a1c
evolve: remove unnecessary code since it's been covered already

We don't need this logic any more since the case of "two divergent
csets where one is the parent of other" has been handled correctly
by the logic present in method _prepcontentdivresolution()

This is how things works in method _prepcontentdivresolution()
for our case i.e "content-divergence with parent-child relation":

  cset_b (content-divergent)
  |
  cset_a (content-divergent)
  |
  ~

Acc. to revision selection criteria:
  "divergent" = min_revision(cset_a, cset_b)
So always "divergent" will be cset_a and "other" will be "cset_b"
and resolution parent will be the successor of parent of cset_a
Both the csets will be merged and resolution cset will be based on
correct revision.
The result could be wrong only in the case when "divergent" is cset_b
which is not possible acc. to the current logic.

diff -r 6f5e6253324f -r 91285cff4b70 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Dec 30 00:43:17 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Dec 30 00:24:09 2019 +0530
@@ -508,10 +508,6 @@
         evolvestate[b'temprevs'].append(divergent.node())
         evolvestate[b'divergent'] = divergent.node()
 
-    # Sometimes we already have the other cset where we want it
-    if relocatereq and other == divergent.p1():
-        relocatereq = False
-
     # relocate the other divergent if required
     if relocatereq:
         # relocating will help us understand during the time of conflicts that