From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
Date: Thu, 16 May 2013 16:14:40 -0700 [thread overview]
Message-ID: <7vsj1m34bj.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAMP44s3HKgWE=8SU+aBMBWzwe-fQ8Rjf0yGmGQxcdedhYCNJmQ@mail.gmail.com> (Felipe Contreras's message of "Thu, 16 May 2013 18:04:41 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> 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.
OK. Thanks for keeping an eye on real user reports.
Please relay our thanks to Rodney as well.
next prev parent reply other threads:[~2013-05-16 23:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 12:43 [PATCH] Revert "remote-hg: update bookmarks when pulling" Felipe Contreras
2013-05-16 16:39 ` Junio C Hamano
2013-05-16 18:16 ` Junio C Hamano
2013-05-16 23:04 ` Felipe Contreras
2013-05-16 23:14 ` Junio C Hamano [this message]
2013-05-16 22:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vsj1m34bj.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox