--- a/hgext/bookmarks.py Thu Feb 10 13:46:28 2011 -0600
+++ b/hgext/bookmarks.py Thu Feb 10 13:46:28 2011 -0600
@@ -227,12 +227,6 @@
bookmarks.update(self, parents, node)
return result
- def _findtags(self):
- """Merge bookmarks with normal tags"""
- (tags, tagtypes) = super(bookmark_repo, self)._findtags()
- tags.update(self._bookmarks)
- return (tags, tagtypes)
-
repo.__class__ = bookmark_repo
def pull(oldpull, ui, repo, source="default", **opts):
--- a/mercurial/localrepo.py Thu Feb 10 13:46:28 2011 -0600
+++ b/mercurial/localrepo.py Thu Feb 10 13:46:28 2011 -0600
@@ -360,6 +360,7 @@
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)