equal
deleted
inserted
replaced
251 # after rebasing, the changeset against which revert should |
251 # after rebasing, the changeset against which revert should |
252 # happen should be the new rebased changeset |
252 # happen should be the new rebased changeset |
253 bumped = tmpctx |
253 bumped = tmpctx |
254 rebasedbmupdate = _bookmarksupdater(repo, bumped.node(), tr) |
254 rebasedbmupdate = _bookmarksupdater(repo, bumped.node(), tr) |
255 except MergeFailure: |
255 except MergeFailure: |
256 repo.vfs.write('graftstate', bumped.hex() + '\n') |
256 evolvestate['current'] = bumped.hex() |
|
257 evolvestate.save() |
257 repo.ui.write_err(_('evolution failed!\n')) |
258 repo.ui.write_err(_('evolution failed!\n')) |
258 msg = _("fix conflict and run 'hg evolve --continue'\n") |
259 msg = _("fix conflict and run 'hg evolve --continue'\n") |
259 repo.ui.write_err(msg) |
260 repo.ui.write_err(msg) |
260 raise |
261 raise |
261 |
262 |