On 2/11/2021 3:13 AM, Junio C Hamano wrote: > Taylor Blau <me@xxxxxxxxxxxx> writes: > >> Since tb/pack-revindex-on-disk is queued to be merged to 'master', but hasn't >> yet been merged, this series is based on that branch. > > This seems to have a light conflict with Derrick's chunked file > format work in midx.c where pack_info is renamed and extended so the > new pack_order variable now needs to become a member in it. > > I think I resolved it OK, but without any callers that actually > utilize the new code or tests, it is almost impossible to have any > confidence in the result of the conflict resolution X-<. > > Could you two please look over to see if I made any silly mistakes, > when I pushe it out later? I reproduced your merge and got very similar results. The differences that happened between my result and yours are not meaningful in any way. Definitely a very subtle merge, so thank you for doing that! -Stolee
