Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 13385:d012d95499f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tags: do not merge bookmarks with tags bookmarks are no tags, therefore they should not be returned as tags.
author David Soria Parra <dsp@php.net>
date Fri, 11 Feb 2011 19:44:17 +0100
parents caa561759538
children 327719a44b6a
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Feb 11 19:36:15 2011 +0100
+++ b/mercurial/localrepo.py	Fri Feb 11 19:44:17 2011 +0100
@@ -360,7 +360,6 @@
             if node != nullid:
                 tags[encoding.tolocal(name)] = node
         tags['tip'] = self.changelog.tip()
-        tags.update(self._bookmarks)
         tagtypes = dict([(encoding.tolocal(name), value)
                          for (name, value) in tagtypes.iteritems()])
         return (tags, tagtypes)