Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: pass the base revision in _completecontentdivergent()
authorPulkit Goyal <7895pulkit@gmail.com>
Tue, 05 Jun 2018 03:51:01 +0530
changeset 3789 13eef43a961f
parent 3788 ae30da2e210d
child 3790 5b9e3aaa6da8
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.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- 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()
evolve