# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1597924942 -19800
# Node ID 9034eef6e737564bba54633d019445484b32f812
# Parent  5907b495901ece6245e89e39248cb13b9bc64c10
evolve: resolutionparent should be succs of otherp1

In current behavior when one of the divergent cset is ahead
of other, we set successor of ahead one's parent as resolution
parent.
This patch make sure that we follow the same logic for the case
when "other" is ahead of "divergent".

diff -r 5907b495901e -r 9034eef6e737 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Thu Aug 13 18:10:51 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Aug 20 17:32:22 2020 +0530
@@ -413,7 +413,7 @@
         relocatereq = True
 
         divergent, other = swapnodes(divergent, other)
-        resolutionparent = divergent.p1().node()
+        resolutionparent = repo[succsotherp1].node()
     else:
         msg = _(b"skipping %s: have a different parent than %s "
                 b"(not handled yet)\n") % (divergent, other)