[Updated] D8816: merge: introduce hasconflicts() on mergeresult object

[indygreg (Gregory Szorc)]

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

INLINE COMMENTS

> merge.py:589
> +            if m not in (
> +                mergestatemod.ACTION_GET,
> +                mergestatemod.ACTION_KEEP,

This preserves the old logic, so this is a fine refactor. But I don wonder if this should be an explicit inclusion set rather than an exclusion one. The way it is now, if we add an action and forget to update this set, this code could be buggy.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

To: pulkit, #hg-reviewers, indygreg
Cc: indygreg, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/3e47359d/attachment-0001.html>