From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 04 Oct 2011 20:58:29 GMT
Subject: Re: [PATCH v3] refs: Use binary search to lookup refs faster
Message-ID: <7vehysbhje.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vd3egj6aa.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
>> Um, well, my patch series includes the same changes that Julian's wants
>> to introduce, but following lots of other changes, cleanups,
>> documentation improvements, etc.  Moreover, my patch series builds on
>> mh/iterate-refs, with which Julian's patch conflicts.  In other words,
>> it would be a real mess to reroll my series on top of Julian's patch.
>
> Conflicts during re-rolling was not something I was worried too much
> about---that is just the fact of life. We cannot easily resolve two topics
> that want to go in totally different direction, but we should be able to
> converge two topics that want to take the same approach in the end,
> especially one is a subset of the other.

Ah, also I should have noted that I have a fix-up between mh/iterate-refs
and Julian's patch already queued on 'pu'.

I am planning to make mh/iterate-refs graduate to 'master' soonish, so
hopefully things will become simpler.

Thanks.