Mercurial > hg-stable

changeset 26767:69a121c378ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:02:32 -0700
parents a83110faece1
children ac68769a5985
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Oct 15 00:57:56 2015 -0700
+++ b/mercurial/localrepo.py	Thu Oct 15 01:02:32 2015 -0700
@@ -1564,7 +1564,7 @@
             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'))