Patchwork [4,of,7,mergedriver] localrepo.commit: abort if merge driver's conclude step hasn't been run yet

login
register
mail settings
Submitter Siddharth Agarwal
Date Oct. 17, 2015, 2:35 a.m.
Message ID <b26471af00081117969f.1445049317@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11160/
State Accepted
Headers show

Comments

Siddharth Agarwal - Oct. 17, 2015, 2:35 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444896152 25200
#      Thu Oct 15 01:02:32 2015 -0700
# Node ID b26471af00081117969f3d2bd2a35891dc76f91e
# Parent  d5ffcf6fd5b81033c08ca68ea97b2b2a1382befc
localrepo.commit: abort if merge driver's conclude step hasn't been run yet

This case also requires 'hg resolve --all' to be run before continuing.

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1565,7 +1565,7 @@  class localrepository(object):
             if unresolved:
                 raise error.Abort(_('unresolved merge conflicts '
                                     '(see "hg help resolve")'))
-            if driverresolved:
+            if driverresolved or ms.mdstate() != 's':
                 raise error.Abort(_('driver-resolved merge conflicts'),
                                   hint=_('run "hg resolve --all" to resolve'))