Show More
@@ -227,12 +227,6 b' def reposetup(ui, repo):' | |||
|
227 | 227 | bookmarks.update(self, parents, node) |
|
228 | 228 | return result |
|
229 | 229 | |
|
230 | def _findtags(self): | |
|
231 | """Merge bookmarks with normal tags""" | |
|
232 | (tags, tagtypes) = super(bookmark_repo, self)._findtags() | |
|
233 | tags.update(self._bookmarks) | |
|
234 | return (tags, tagtypes) | |
|
235 | ||
|
236 | 230 | repo.__class__ = bookmark_repo |
|
237 | 231 | |
|
238 | 232 | def pull(oldpull, ui, repo, source="default", **opts): |
@@ -360,6 +360,7 b' class localrepository(repo.repository):' | |||
|
360 | 360 | if node != nullid: |
|
361 | 361 | tags[encoding.tolocal(name)] = node |
|
362 | 362 | tags['tip'] = self.changelog.tip() |
|
363 | tags.update(self._bookmarks) | |
|
363 | 364 | tagtypes = dict([(encoding.tolocal(name), value) |
|
364 | 365 | for (name, value) in tagtypes.iteritems()]) |
|
365 | 366 | return (tags, tagtypes) |
General Comments 0
You need to be logged in to leave comments.
Login now