Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.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 883d887c6408
children 8ee0de123989
line wrap: on
line diff
--- 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'))