branch | stable |
changeset 18122 | 730b769fb634 |
parent 17984 | b74361cf7c0a |
child 18133 | 7f5a0eba3768 |
--- a/mercurial/commands.py Thu Nov 29 08:44:54 2012 -0500 +++ b/mercurial/commands.py Mon Dec 24 13:26:13 2012 +0100 @@ -4288,7 +4288,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]