[PATCH 5 of 7 mergedriver] merge.applyupdates: use counters from mergestate

[Martin von Zweigbergk]

On Sun, Nov 22, 2015 at 9:43 PM Siddharth Agarwal <sid at less-broken.com>
wrote:

> On 11/22/15 21:32, Martin von Zweigbergk wrote:
> > Can 'preresolve' now stop returning the 'r' value now? I saw that it's
> > also used in commands.py:5677, but maybe there's now a better way to
> > do that just there was here?
>
> I don't think so -- higher level functions still need to know if there
> was a failure during (pre)resolution.
>

I think they can do that by checking the mergestate for the file, but if
they want to do that, we might as well continue to return the result for
convenience (i.e., let's leave it as is).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20151123/5459d270/attachment-0002.html>