Mercurial > evolve

changeset 5563:9034eef6e737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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".
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Thu, 20 Aug 2020 17:32:22 +0530
parents 5907b495901e
children 0e23393dda9c
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)