comparison docs/figures/figure-ug11.svg @ 3830:e0a20dc69126

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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 15:52:11 +0530
parents 8328337d23b2
children 091eab1223a4
comparison
equal deleted inserted replaced
3829:cb45a7173e5b 3830:e0a20dc69126