# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1525004641 -19800
# Node ID aae54e80c95c29a49ae2b3ba15ff22e4d913da95
# Parent  7aa22aadb7bbd670e64e4a6b59b9ddec57f1163d
evolve: store divergent nodes in evolvestate when resolving content-divergence

We need to store the divergent nodes in evolvestate so that we can continue an
interrupted phase divergence resolution.

diff -r 7aa22aadb7bb -r aae54e80c95c hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Wed May 02 11:59:06 2018 +0200
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 17:54:01 2018 +0530
@@ -338,6 +338,7 @@
     """
     repo = repo.unfiltered()
     divergent = repo[divergent.rev()]
+    evolvestate['divergent'] = divergent.node()
     base, others = divergentdata(divergent)
     if len(others) > 1:
         othersstr = "[%s]" % (','.join([str(i) for i in others]))
@@ -355,6 +356,7 @@
         ui.write_err(msg)
         return (False, '')
     other = others[0]
+    evolvestate['other-divergent'] = other.node()
     if len(other.parents()) > 1:
         msg = _("skipping %s: %s changeset can't be "
                 "a merge (yet)\n") % (divergent, TROUBLES['CONTENTDIVERGENT'])