mercurial/bookmarks.py

--- a/mercurial/bookmarks.py	Wed Mar 21 17:24:15 2012 +0900
+++ b/mercurial/bookmarks.py	Wed Mar 21 16:39:38 2012 -0500
@@ -169,7 +169,7 @@
     d = {}
     for k, v in marks.iteritems():
         # don't expose local divergent bookmarks
-        if '@' not in k and not k.endswith('@'):
+        if '@' not in k or k.endswith('@'):
             d[k] = hex(v)
     return d