Mercurial > hg > hg-git

changeset 591:2320ab6ada36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with master.
author Augie Fackler <raf@durin42.com>
date Fri, 23 Nov 2012 20:20:48 -0600
parents 4d9e2d2a2c19 (current diff) 96e75caaf900 (diff)
children 163c452531cf 47df57f2bb2b
files hggit/git_handler.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -1130,7 +1130,10 @@
                     bookmarks.write(self.repo, bms)
                 else:
                     self.repo._bookmarks = bms
-                    bookmarks.write(self.repo)
+                    if getattr(bms, 'write', None): # hg >= 2.5
+                        bms.write()
+                    else: # hg < 2.5
+                        bookmarks.write(self.repo)
 
         except AttributeError:
             self.ui.warn(_('creating bookmarks failed, do you have'