Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 5716:be367cbafe70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: make bail_if_changed bail on uncommitted merge
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 23:55:39 -0600
parents 2493a478f395
children 0145f9afb0e7
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Thu Dec 27 23:55:39 2007 -0600
+++ b/mercurial/cmdutil.py	Thu Dec 27 23:55:39 2007 -0600
@@ -64,6 +64,8 @@
     raise UnknownCommand(cmd)
 
 def bail_if_changed(repo):
+    if repo.dirstate.parents()[1] != nullid:
+        raise util.Abort(_('outstanding uncommitted merge'))
     modified, added, removed, deleted = repo.status()[:4]
     if modified or added or removed or deleted:
         raise util.Abort(_("outstanding uncommitted changes"))