Re: What's (not) cooking

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 9, 2018, 16:13 UTC
Message-ID: <xmqqlgakfkus.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <3d8bc7b8-b7be-4583-469e-6b962607b3a7@gmail.com>

Derrick Stolee <stolee@gmail.com> writes:

Show 17 quoted lines

> On 7/6/2018 6:57 PM, Junio C Hamano wrote:
>> I'll be pushing out the integration branches with some updates, but
>> there is no change in 'next' and below.  The following topics I gave
>> a quick look and gave them topic branches, but I had trouble merging
>> them in 'pu' and making them work correctly or pass the tests, so
>> they are not part of 'pu' in today's pushout.
>>
>>      pk/rebase-in-c
>>      en/dirty-merge-fixes
>>      en/t6036-merge-recursive-tests
>>      en/t6042-insane-merge-rename-testcases
>>      ds/multi-pack-index
>
> I tested merging ds/multi-pack-index against the latest pu and the
> only issue I had was with header files being added to 'packfile.c' and
> 'building/repack.c'. Both were that I added "#include <midx.h>" and
> cc/remote-odb added "#include <remote-odb.h>".

I think ds/multi-pack-index didn't have any difficult textual merge conflicts. I ran out of time making 'pu' build with new topics and listed the ones that were left behind. As Elijah already identified, there was a bad apple not listed above that was in 'pu' that made the tests fail, so the above is not even a complete list of "bad" topics. It was merely an "I have them but 'pu' doesn't include them" list.

Thanks.