From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Nov 2009 19:56:43 GMT
Subject: Re: [PATCH 3/8] git-merge-recursive-{ours,theirs}
Message-ID: <7viqcrlrb8.fsf@alter.siamese.dyndns.org>
In-Reply-To: <32541b130911301008v4156f0c6ge9f30952565392f9@mail.gmail.com>

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.

Thanks.