From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 16 May 2013 23:04:41 GMT
Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
Message-ID: <CAMP44s3HKgWE=8SU+aBMBWzwe-fQ8Rjf0yGmGQxcdedhYCNJmQ@mail.gmail.com>
In-Reply-To: <7vbo8a6b9c.fsf@alter.siamese.dyndns.org>

On Thu, May 16, 2013 at 1:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Felipe Contreras <felipe.contreras@gmail.com> 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 <felipe.contreras@gmail.com>
>>> ---
>>>
>>> Intended for master (v1.8.3).
>>
>> Hmm, is this the one we merged yesterday?
>
> Just double-checking.

Yes.

-- 
Felipe Contreras