Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorSiddharth Agarwal <sid0@fb.com>
Thu, 15 Oct 2015 01:02:32 -0700
changeset 26767 69a121c378ef
parent 26766 a83110faece1
child 26768 ac68769a5985
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.
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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'))
Mercurial