[Updated] D9033: mergestate: split up reset() for its two use cases

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Fri Sep 18 02:16:55 UTC 2020


This revision is now accepted and ready to land.
indygreg added inline comments.
indygreg accepted this revision.

INLINE COMMENTS

> mergestate.py:205
>          self._stateextras = collections.defaultdict(dict)
> -        self._local = node
> -        self._other = other

It is slightly weird to me that `reset()` doesn't wipe out these attributes after this change. Shouldn't a reset... reset to default state (None)?

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

To: martinvonz, #hg-reviewers, indygreg
Cc: indygreg, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200918/14aaf909/attachment-0002.html>


More information about the Mercurial-patches mailing list