# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1528712531 -19800
# Node ID e0a20dc691262b440e20fc3306894d460197397e
# Parent  cb45a7173e5b6f345cd2440de6da86df802819b6
evolve: store obsmarkers to be deleted in evolvestate

There are operations which don't create a new node rather they just obsolete one
of the unstable node in favour of existing one. In such cases if a further
resolution leads to conflicts and user calls `evolve --abort` or `evolve
--stop`, we might need to delete that obsmarker. So let's store such obsmarkers
in the evolvestate.

diff -r cb45a7173e5b -r e0a20dc69126 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Jun 11 15:38:43 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Jun 11 15:52:11 2018 +0530
@@ -1455,7 +1455,7 @@
                      'revs': list(revs), 'confirm': confirmopt,
                      'startnode': startnode.node(), 'skippedrevs': [],
                      'command': 'evolve', 'orphanmerge': False,
-                     'bookmarkchanges': [], 'temprevs': []}
+                     'bookmarkchanges': [], 'temprevs': [], 'obsmarkers': []}
         evolvestate.addopts(stateopts)
         for rev in revs:
             curctx = repo[rev]