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: store the base of content-divergents in evolvestate
authorPulkit Goyal <7895pulkit@gmail.com>
Tue, 05 Jun 2018 03:49:49 +0530
changeset 3788 ae30da2e210d
parent 3787 dc81a788f278
child 3789 13eef43a961f
evolve: store the base of content-divergents in evolvestate We need the base changeset for merging commit messages, branches. Let's store it in evolvestate.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/evolvecmd.py	Tue Jun 05 00:53:21 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Jun 05 03:49:49 2018 +0530
@@ -362,6 +362,7 @@
         return (False, '')
     other = others[0]
     evolvestate['other-divergent'] = other.node()
+    evolvestate['base'] = base.node()
 
     # we don't handle merge content-divergent changesets yet
     if len(other.parents()) > 1:
@@ -1392,6 +1393,7 @@
                 tr = repo.transaction('evolve')
                 divergent = evolvestate['divergent']
                 other = evolvestate['other-divergent']
+                base = evolvestate['base']
                 repo = repo.unfiltered()
                 ret = _completecontentdivergent(ui, repo, progresscb,
                                                 repo[divergent],
evolve