Mercurial > public > mercurial-scm > hg

diff mercurial/bookmarks.py @ 16276:6b16ded5c810 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: clone non-divergent bookmarks with @ in them
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 21 Mar 2012 16:39:38 -0500
parents 6ba530122d8b
children 5983de86462c
line wrap: on
line diff
--- 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