Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 18133:7f5a0eba3768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 26 Dec 2012 11:16:18 -0600
parents 2c1fc483efa4 730b769fb634
children 242d2f4ec01c
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Dec 24 02:49:59 2012 +0100
+++ b/mercurial/commands.py	Wed Dec 26 11:16:18 2012 -0600
@@ -4360,7 +4360,7 @@
 
     if not node and repo._bookmarkcurrent:
         bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
-        curhead = repo[repo._bookmarkcurrent]
+        curhead = repo[repo._bookmarkcurrent].node()
         if len(bmheads) == 2:
             if curhead == bmheads[0]:
                 node = bmheads[1]