[Changed Subscribers] D8567: mergestate: implement trivial in-memory mergestate

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> mergestate.py:94
> +    @util.propertycache
> +    def mergedriver(self):
> +        # protect against the following:

Can we really get the merge driver to work with `memmergestate`? Maybe it's better to make `memmergestate.mergedriver` raise an exception so we catch it?

Ah, I was curious how that could possibly work so far and it turns out that there is indeed a check at `merge.py:2039`. You could move that exception to `memmergestate.mergedriver`, I think.

REPOSITORY
  rHG Mercurial

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

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

To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200519/9985b6a7/attachment-0002.html>