Re: [PATCH 3/8] git-merge-recursive-{ours,theirs}

From: Avery Pennarun <apenwarr@gmail.com>
Date: Nov 30, 2009, 20:02 UTC
Message-ID: <32541b130911301202j2b551d80v650d252b7934eb98@mail.gmail.com>
In-Reply-To: <7viqcrlrb8.fsf@alter.siamese.dyndns.org>

On Mon, Nov 30, 2009 at 2:56 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 14 quoted lines

> Avery Pennarun <apenwarr@gmail.com> writes:
>>> I've queued the series with minor fixes to 'pu' and pushed it out.
>>
>> Since I see you didn't change a couple of things you mentioned in
>> earlier comments (the NEEDSWORK comment and the sq-then-eval trick) do
>> you still want me to respin this series?
>
> The commit still is NEEDSWORK and shouldn't be in 'next' in its current
> shape.  I don't think the topic is 1.6.6 material yet, and we will be in
> pre-release feature freeze any minute now, so there is no urgency.
>
> As I did the sq-then-eval in many places in our Porcelain scripts (and
> many of them are converted to C and lost the need for the trick), I may
> get tempted to fix it up when I am bored ;-).  But no promises.

I'll interpret that as "no, I should not respin the series because Junio plans to deal with it" :)

Do let me know if there's anything I should do to help this advance from pu->next sooner (if they delay is not simply because of the code freeze).

Have fun,

Avery