changeset 3631 | 8db32b33cdf1 |
parent 3630 | 2789c0ec2ad7 |
child 3632 | 8d38b88233cb |
--- a/hgext3rd/evolve/evolvecmd.py Sat Mar 24 13:17:05 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Sat Mar 24 16:38:03 2018 +0530 @@ -254,6 +254,7 @@ rebasedbmupdate = _bookmarksupdater(repo, bumped.node(), tr) except MergeFailure: evolvestate['current'] = bumped.hex() + evolvestate['precursor'] = prec.hex() evolvestate.save() repo.ui.write_err(_('evolution failed!\n')) msg = _("fix conflict and run 'hg evolve --continue'\n")