From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH v3] refs: Use binary search to lookup refs faster Date: Sat, 01 Oct 2011 22:45:17 -0700 Message-ID: <7vd3egj6aa.fsf@alter.siamese.dyndns.org> References: <4DF6A8B6.9030301@op5.se> <201109281338.04378.mfick@codeaurora.org> <201109281610.49322.mfick@codeaurora.org> <960aacbf-8d4d-4b2a-8902-f6380ff9febd@email.android.com> <7c0105c6cca7dd0aa336522f90617fe4@quantumfyre.co.uk> <4E84B89F.4060304@lsrfire.ath.cx> <7vy5x7rwq9.fsf@alter.siamese.dyndns.org> <20110929041811.5363.33396.julian@quantumfyre.co.uk> <7vvcsbqa0k.fsf@alter.siamese.dyndns.org> <20110929221143.23806.25666.julian@quantumfyre.co.uk> <7v62karjv3.fsf@alter.siamese.dyndns.org> <4E85E07C.5070402@alum.mit.edu> <7vk48qouht.fsf@alter.siamese.dyndns.org> <4E87F383.1050403@alum.mit.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Julian Phillips , Martin Fick , Christian Couder , git@vger.kernel.org, Christian Couder , Thomas Rast To: Michael Haggerty X-From: git-owner@vger.kernel.org Sun Oct 02 07:45:36 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RAErk-0008Ck-2M for gcvg-git-2@lo.gmane.org; Sun, 02 Oct 2011 07:45:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750916Ab1JBFpW (ORCPT ); Sun, 2 Oct 2011 01:45:22 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:46553 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750695Ab1JBFpU (ORCPT ); Sun, 2 Oct 2011 01:45:20 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id D82093714; Sun, 2 Oct 2011 01:45:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=BH1Jbf0o6tdfHd+yiftIgQ7JF8Y=; b=udfl9u kSJckFpJkljgRObF/+tlVnaA82JvB0K6VIoSUgMmaysDm9aZ7+IetPK69qAx+dzE QWQDY7PM58oMJc2LfqkQ0hFi1CKAxuy6yaXBmny1PZAxxA3JBcTNpihEo1YJPhCn JnMBT7c6/oRoAIXct2YXRYkq6slKHULM5isv4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=vE+WQNGjSwFvsQENfX/oBCsFY6TDWxz2 u572rOrSS7TzV6mn817qX1GjrFW+vVpMHed1aPN1UV7uYMBvdnAXmC8WjnkoSoUa cdpkyvW7bOkaMsPZ9fC0GvvxbBJChXKNm0gRDiEeL7CWc5C7MHb/oU1FovA9Jto3 ReP/P4EoUjc= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id CEAD33713; Sun, 2 Oct 2011 01:45:19 -0400 (EDT) Received: from pobox.com (unknown [76.102.170.102]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 5ADCD3712; Sun, 2 Oct 2011 01:45:19 -0400 (EDT) In-Reply-To: <4E87F383.1050403@alum.mit.edu> (Michael Haggerty's message of "Sun, 02 Oct 2011 07:15:47 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: B660FAD8-ECB9-11E0-87E8-9DB42E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Michael Haggerty 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.