# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1528150789 -19800
# Node ID ae30da2e210d5a6ba45267d267e0892267ff9940
# Parent  dc81a788f278773e924dbc940772152575041152
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.

diff -r dc81a788f278 -r ae30da2e210d hgext3rd/evolve/evolvecmd.py
--- 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],