changeset 3628 | 170b99a9c0b4 |
parent 3627 | 31569df48c82 |
child 3629 | f23946bf6625 |
--- a/hgext3rd/evolve/evolvecmd.py Fri Mar 23 19:16:25 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Fri Mar 23 19:36:08 2018 +0530 @@ -253,7 +253,8 @@ bumped = tmpctx rebasedbmupdate = _bookmarksupdater(repo, bumped.node(), tr) except MergeFailure: - repo.vfs.write('graftstate', bumped.hex() + '\n') + evolvestate['current'] = bumped.hex() + evolvestate.save() repo.ui.write_err(_('evolution failed!\n')) msg = _("fix conflict and run 'hg evolve --continue'\n") repo.ui.write_err(msg)