Junio C Hamano <gitster@xxxxxxxxx> writes: > This is turning out to be messier than I like. > > The topic is tangled with too many things in flight and I think I > reduced its dependencies down to nd/the-index and > sb/more-repo-in-api plus then-current tip of master (and that is why > it is based on a1411cecc7), but it seems that it wants a bit more > than that; builtin/rebase.c at its tip does not even compile, so > I'll need to wiggle the topic before it can go to 'next'. Half false alarm. I do need to wiggle the topic, but that was not because the choice of base was bad. It was that nd/the-index plus sb/more-repo-in-api had semantic merge conflicts with the then-current master. > And worse yet, it seems that filter-options-should-use-plain-int > topic depends on this topic in turn as it wants to use > LOFC_TREEE_DEPTH. This part is still true. The scaling-factor-over-the-wire topic does need to be rebuilt on top of this one.
