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.
--- 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]