Changeset 5614b702e17c…
Parent 39a514dbe2fc…
by
Changes to one file · Browse files at 5614b702e17c Showing diff from parent 39a514dbe2fc Diff from another changeset...
@@ -79,7 +79,11 @@ pass
if bookmarks:
if repo.ui.configbool('bookmarks', 'track.current'):
- self.curbookmark = bookmarks.current(repo)
+ # bookmarks.py changed between 1.4 and 1.5
+ if hasattr(repo, '_bookmarkcurrent'):
+ self.curbookmark = repo._bookmarkcurrent
+ else:
+ self.curbookmark = bookmarks.current(repo)
try:
self.wcparents = [x.rev() for x in repo.parents()]
self.tagrevs = [repo[r].rev() for t, r in repo.tagslist()]
|
Loading...