Commits

Augie Fackler committed 2320ab6 Merge

Merge with master.

  • Participants
  • Parent commits 4d9e2d2, 96e75ca

Comments (0)

Files changed (1)

hggit/git_handler.py

                     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'