Re: What's cooking in git.git (Jan 2010, #06; Wed, 20)

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 21, 2010, 04:06 UTC
Message-ID: <7vvdeww187.fsf@alter.siamese.dyndns.org>
In-Reply-To: <201001210240.10522.johan@herland.net>

Johan Herland <johan@herland.net> writes:

Show 14 quoted lines

> On Thursday 21 January 2010, Sverre Rabbelier wrote:
>> On Thu, Jan 21, 2010 at 01:52, Junio C Hamano <gitster@pobox.com> wrote:
>> > * jh/notes (2010-01-17) 23 commits
>> > [...]
>> > Updated with a re-roll.
>> 
>> Just checking, you reverted all from next (with exception of the first
>> three), and now re-queued it to pu, with the first three still in
>> next? Or did I mis-remember and did only the first three make it to
>> next in the first place?
>
> You misremembered. Only the three first were merged to 'next'. Junio was 
> about to merge the rest, but I asked him to hold until I had produced the 
> current iteration.

I've been meaning to merge the first three to 'master', as many people have been running 'next' and new features tend to be exercised less by those on 'master' than on 'next', and it would be beneficial to make 'master' at 1.7.0-rc0 as close to what we have had in 'next' for a long time.

Worries?