--- a/mercurial/commands.py	Thu Sep 17 10:59:52 2015 -0700
+++ b/mercurial/commands.py	Thu Sep 17 12:44:52 2015 -0700
@@ -4785,7 +4785,7 @@
                 "please merge with an explicit rev or bookmark"),
                 hint=_("run 'hg heads' to see all heads"))
 
-    if not node and not repo._activebookmark:
+    elif not node:
         branch = repo[None].branch()
         bheads = repo.branchheads(branch)
         nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]