Mercurial > evolve

changeset 3789:13eef43a961f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: pass the base revision in _completecontentdivergent() We need the base revision to merge commit messages, branches and more stuff. Let's make sure we have that by passing into the function which completes the divergence resolution.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 05 Jun 2018 03:51:01 +0530
parents ae30da2e210d
children 5b9e3aaa6da8
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Tue Jun 05 03:49:49 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Jun 05 03:51:01 2018 +0530
@@ -435,10 +435,10 @@
                             " use 'hg update -C .' to abort"))
 
     return _completecontentdivergent(ui, repo, progresscb, divergent, other,
-                                     evolvestate)
+                                     base, evolvestate)
 
 def _completecontentdivergent(ui, repo, progresscb, divergent, other,
-                              evolvestate):
+                              base, evolvestate):
     """completes the content-divergence resolution"""
     # no conflicts were there in merging content divergent changesets, let's
     # resume resolution
@@ -1398,6 +1398,7 @@
                 ret = _completecontentdivergent(ui, repo, progresscb,
                                                 repo[divergent],
                                                 repo[other],
+                                                repo[base],
                                                 evolvestate)
                 evolvestate['replacements'][divergent] = ret[1]
                 tr.close()