On Fri, 25 Jan 2008, Junio C Hamano wrote: > Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes: > > > It's likely that this should get merged in some way with Linus's series to > > handle the in-core index differently in general. But this is a simple > > solution to the problem that's sufficient for this particular series. > > Just to let you know, the early parts of lt/in-core-index series > are already in 'next', and it will be one of the first topics to > graduate to 'master' post 1.5.4. > > I think we both understand that this round is sent purely for > discussion and I won't be picking them up right now nor later > before the "for possible inclusion" resend you will be making > post 1.5.4, so it should not matter too much which exact version > this round is based on. > > It however may be worthwhile for you to plan rebasing your > future rounds on top of 077c48df8a72b046a2f562fedffa1c3d3a73a4e2 > (read-cache.c: fix a couple more CE_REMOVE conversion). I've now got a version rebased on that. The conflicts are pretty straightforward, and the tests all pass (once I fix the unrelated bug in 9/9 wrt the lockfile API change). -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
