D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Jul 8 17:48:48 EDT 2019


pulkit added a comment.


  Also, can you add an entry about this to relnotes/next?

INLINE COMMENTS

> commands.py:4020
> +        state = cmdutil.getunfinishedstate(repo)
> +        if state._opname != 'merge':
> +            raise error.Abort(_('cannot abort merge with %s in progress') %

state can be `None` here.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6607/new/

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

To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list