mercurial/commands.py
changeset 20237 0d32dd60016c
parent 20235 a602d2aca8bf
child 20275 2123d27ff75d
--- a/mercurial/commands.py	Sat Nov 16 15:46:29 2013 -0500
+++ b/mercurial/commands.py	Sat Nov 16 15:46:29 2013 -0500
@@ -667,12 +667,13 @@
 
     if command:
         changesets = 1
-        try:
-            node = state['current'][0]
-        except LookupError:
-            if noupdate:
+        if noupdate:
+            try:
+                node = state['current'][0]
+            except LookupError:
                 raise util.Abort(_('current bisect revision is unknown - '
                                    'start a new bisect to fix'))
+        else:
             node, p2 = repo.dirstate.parents()
             if p2 != nullid:
                 raise util.Abort(_('current bisect revision is a merge'))