From: Richard Hansen <rhansen@bbn.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, felipe.contreras@gmail.com
Subject: Re: [PATCH v2] remote-bzr: reuse bzrlib transports when possible
Date: Thu, 12 Sep 2013 17:05:16 -0400 [thread overview]
Message-ID: <52322C8C.4000501@bbn.com> (raw)
In-Reply-To: <xmqqbo40wd3d.fsf@gitster.dls.corp.google.com>
On 2013-09-10 18:01, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Richard Hansen <rhansen@bbn.com> writes:
>>
>>> def do_export(parser):
>>> - global parsed_refs, dirname
>>> + global parsed_refs, dirname, transports
>>
>> As this has been acked by Felipe who knows the script the best, I'll
>> apply this directly to 'master'.
>>
>> These additions of "global transports" however have trivial
>> interactions with fc/contrib-bzr-hg-fixes topic Felipe posted
>> earlier, which I was planning to start merging down to 'next' and
>> then to 'master'. Most funcions merely use the variable without
>> assigning, so "global transports" can be removed, in line with the
>> spirit of 641a2b5b (remote-helpers: cleanup more global variables,
>> 2013-08-28), except for the obvious initialisation in main(), I
>> think. Please double check the conflict resolution result in a
>> commit on 'pu' with
>>
>> git show 'origin/pu^{/Merge fc/contrib-bzr}'
>>
>> when I push the result out.
>>
>> Thanks.
>
> Ping? I'd like to merge fc/contrib-bzr.hg-fixes topic to 'next'
> (and fast track it to 'master' after that), and it would be helpful
> to get an Ack on the conflict resolution I have.
Sorry for the delay.
Looks good to me, and the tests still pass.
-Richard
next prev parent reply other threads:[~2013-09-12 21:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-07 23:58 [PATCH] remote-bzr: reuse bzrlib transports when possible Richard Hansen
2013-09-08 0:02 ` Richard Hansen
2013-09-08 0:30 ` Felipe Contreras
2013-09-08 5:30 ` Richard Hansen
2013-09-08 5:47 ` [PATCH v2] " Richard Hansen
2013-09-09 17:55 ` Junio C Hamano
2013-09-10 22:01 ` Junio C Hamano
2013-09-12 21:05 ` Richard Hansen [this message]
2013-09-12 21:11 ` Junio C Hamano
2013-09-08 0:27 ` [PATCH] " Felipe Contreras
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=52322C8C.4000501@bbn.com \
--to=rhansen@bbn.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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;
as well as URLs for NNTP newsgroup(s).