D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

[dlax (Denis Laxalde)]

dlax requested changes to this revision.
dlax added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> rebase.py:667
> +
> +def _origrebase(ui, repo, **opts):
>      """move changeset (and descendants) to a different branch

Do we need to make another function? Can't we call rebase again with options modified?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1249

To: phillco, #hg-reviewers, durin42, dlax
Cc: dlax, mercurial-devel