From: Junio C Hamano Date: Thu, 16 May 2013 18:16:31 GMT Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: <7vbo8a6b9c.fsf@alter.siamese.dyndns.org> In-Reply-To: <7v4ne27ubp.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > Felipe Contreras writes: > >> This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. >> >> Different versions of Mercurial have different arguments for >> bookmarks.updatefromremote(), while it should be possible to call the >> right function with the right arguments depending on the version, it's >> safer to restore the old behavior for now. >> >> Reported by Rodney Lorrimar. >> >> Signed-off-by: Felipe Contreras >> --- >> >> Intended for master (v1.8.3). > > Hmm, is this the one we merged yesterday? Just double-checking. This is a lot more urgent request for confirmation than anything else I've been sending today (and receiving responses from you about). > >> >> contrib/remote-helpers/git-remote-hg | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg >> index dc276af..beb864b 100755 >> --- a/contrib/remote-helpers/git-remote-hg >> +++ b/contrib/remote-helpers/git-remote-hg >> @@ -363,9 +363,6 @@ def get_repo(url, alias): >> die('Repository error') >> repo.pull(peer, heads=None, force=True) >> >> - rb = peer.listkeys('bookmarks') >> - bookmarks.updatefromremote(myui, repo, rb, url) >> - >> return repo >> >> def rev_to_mark(rev):