D3944: rebase: in --confirm option just abort if hit a conflict

khanchi97 (Sushil khanchi) phabricator at mercurial-scm.org
Sat Jul 14 07:20:57 EDT 2018


khanchi97 added inline comments.

INLINE COMMENTS

> rebase.py:875
>                  needsabort = False
> -                if not ui.promptchoice(_(b'apply changes (yn)?'
> -                                         b'$$ &Yes $$ &No')):

In the case when we hit a conflict, yuya suggested me to either prompt the user to confirm for "rerun rebase that's known to have at least one conflict" OR not prompt at all, just abort if we hit a conflict.
And I think, to keep it simple, just aborting is good option, not sure first option could be more useful though.

REPOSITORY
  rHG Mercurial

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

To: khanchi97, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list