# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1331759622 14400
# Node ID 661dbd42f386611a1c03f3eaf82927d3f1b874d8
# Parent  e16ee632ce6faa93c45cbbcc4320d64418bec737# Parent  5faf9b0ae984b02877837ff6a2e1685d67bd305c
Merge.

diff -r e16ee632ce6f -r 661dbd42f386 prompt.py
--- a/prompt.py	Fri Feb 10 19:31:25 2012 -0500
+++ b/prompt.py	Wed Mar 14 17:13:42 2012 -0400
@@ -110,7 +110,12 @@
             book = getattr(repo, '_bookmarkcurrent', None)
         except KeyError:
             book = getattr(repo, '_bookmarkcurrent', None)
-        return _with_groups(m.groups(), book) if book else ''
+        if book:
+            cur = repo['.'].node()
+            if repo._bookmarks[book] == cur:
+                return _with_groups(m.groups(), book)
+        else:
+            return ''
 
     def _branch(m):
         g = m.groups()