equal
deleted
inserted
replaced
243 tmpid = relocate(repo, bumped, prec.p1()) |
243 tmpid = relocate(repo, bumped, prec.p1()) |
244 if tmpid is not None: |
244 if tmpid is not None: |
245 tmpctx = repo[tmpid] |
245 tmpctx = repo[tmpid] |
246 compat.createmarkers(repo, [(bumped, (tmpctx,))], |
246 compat.createmarkers(repo, [(bumped, (tmpctx,))], |
247 operation='evolve') |
247 operation='evolve') |
|
248 # after rebasing, the changeset against which revert should |
|
249 # happen should be the new rebased changeset |
|
250 bumped = tmpctx |
248 except MergeFailure: |
251 except MergeFailure: |
249 repo.vfs.write('graftstate', bumped.hex() + '\n') |
252 repo.vfs.write('graftstate', bumped.hex() + '\n') |
250 repo.ui.write_err(_('evolution failed!\n')) |
253 repo.ui.write_err(_('evolution failed!\n')) |
251 msg = _("fix conflict and run 'hg evolve --continue'\n") |
254 msg = _("fix conflict and run 'hg evolve --continue'\n") |
252 repo.ui.write_err(msg) |
255 repo.ui.write_err(msg) |