# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1198821339 21600
# Node ID be367cbafe708e1604085ef3291deeba6db8b39f
# Parent  d280774a7498b7a6205ed3cfd0b7b2c5cd45ade8
cmdutil: make bail_if_changed bail on uncommitted merge

diff -r d280774a7498 -r be367cbafe70 mercurial/cmdutil.py
--- 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"))
diff -r d280774a7498 -r be367cbafe70 mercurial/commands.py
--- a/mercurial/commands.py	Thu Dec 27 23:55:39 2007 -0600
+++ b/mercurial/commands.py	Thu Dec 27 23:55:39 2007 -0600
@@ -196,11 +196,9 @@
         raise util.Abort(_("please specify a revision to backout"))
 
     cmdutil.bail_if_changed(repo)
+    node = repo.lookup(rev)
+
     op1, op2 = repo.dirstate.parents()
-    if op2 != nullid:
-        raise util.Abort(_('outstanding uncommitted merge'))
-    node = repo.lookup(rev)
-
     a = repo.changelog.ancestor(op1, node)
     if a != node:
         raise util.Abort(_('cannot back out change on a different branch'))