From 144f48df44a45549ed25b4b899eb01ed71103ba8 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Mon, 14 May 2018 21:21:01 +0200 Subject: [PATCH] Adjust to Mercurial 4.6 wrt bookmarks ... as modified in cd23423029287e299d65bbece497ff09a2a673f4 --- git-remote-hg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git-remote-hg b/git-remote-hg index ea9fd71..dbecfce 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -403,6 +403,13 @@ def updatebookmarks(repo, peer): if not remotemarks: return + # use a higher level API from now on than the lower one below + if check_version(4,6): + for k, v in remotemarks.iteritems(): + old = hghex(localmarks.get(k, '')) + bookmarks.pushbookmark(repo, k, old, v) + return + for k, v in remotemarks.iteritems(): localmarks[k] = hgbin(v)