[PATCH 1 of 7 mergedriver] merge.applyupdates: don't return early if merge driver's conclude failed

Siddharth Agarwal sid at less-broken.com
Mon Nov 16 17:58:00 CST 2015


On 11/16/15 15:54, Martin von Zweigbergk wrote:
> And this ms.commit() gets called after this change too. I hope that's 
> correct, but I don't really know this mergedriver stuff.

Yeah, that's fine. ms.commit() is idempotent.


More information about the Mercurial-devel mailing list