D6503: statecheck: added support for STATES

taapas1128 (Taapas Agrawal) phabricator at mercurial-scm.org
Thu Jun 13 09:22:48 EDT 2019


taapas1128 added inline comments.

INLINE COMMENTS

> cmdutil.py:622
>  
> +def addunfinished(**cmddata):
> +    cmdname = cmddata['cmdname']

@martinvonz have a look this is making sure bisect and merge stays the last.

> taapas1128 wrote in state.py:174
> I went through the code this is happening due to the `checkunfinished()` which is called just before the commit in `_docommit()` at line `1666`

I guess the problem was with wrong value of `allowcommit` flag for merge. It is not skipped now and it works alright.

REPOSITORY
  rHG Mercurial

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

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

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


More information about the Mercurial-devel mailing list