# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1525007916 -19800
# Node ID 4b8c63d14f188cb4e28d49b3460edb0dd9027957
# Parent  bdf7fb6af7b84af72efbc857be141f1810099aa0
evolve: store the evolvestate file when encountering conflicts

This patch makes `hg evolve` store the evolvestate file when it encounters merge
conflicts while resolving content-divergence.

diff -r bdf7fb6af7b8 -r 4b8c63d14f18 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 18:13:29 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 18:48:36 2018 +0530
@@ -417,6 +417,7 @@
     if compat.hasconflict(stats):
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                          "or 'hg update -C .' to abort\n"))
+        evolvestate.save()
         raise error.Abort('merge conflict between several amendments '
                           '(this is not automated yet)',
                           hint="""/!\ You can try: