Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes: > On Thu, 10 Aug 2017 14:19:59 -0700 > Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes: >> >> > Here is the complete patch set. I have only moved the exported functions >> > that operate with packfiles and their static helpers - for example, >> > static functions like freshen_packed_object() that are used only by >> > non-pack-specific functions are not moved. >> >> This will interfere with smaller changes and fixes we want to have >> early in the 'master' branch, so while I think it is a good idea to >> do something like this in the longer term, I'd have to ask you to >> either hold on or rebase this on them (you'll know what else you are >> conflicting with when you try to merge this to 'pu' yourself). >> >> Thanks. > > OK, I'll wait until you have updated the master branch, then I'll try to > rebase on it. That will take a few weeks, and I do not think we want you idling during that time ;-). You'd need to double check, but I think the topics that cause trouble are rs/find-apck-entry-bisection and jk/drop-sha1-entry-pos; you can start from v2.14.1 and merge these topics on top and then build your change on top. That would allow you to start cooking before both of them graduate to 'master', as I expect they are both quick-to-next material. There might be other topics that interfere with what you are doing, but you can easily find out what they are if you do a trial merge to 'next' and 'pu' yourself. Thanks.
