From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <junkio@cox.net>
Subject: Re: Handling large files with GIT
Date: Wed, 15 Feb 2006 19:29:40 -0800
Message-ID: <7vlkwckml7.fsf@assigned-by-dhcp.cox.net>
References: <46a038f90602080114r2205d72cmc2b5c93f6fffe03d@mail.gmail.com>
	<87slqty2c8.fsf@mid.deneb.enyo.de>
	<46a038f90602081435x49e53a1cgdc56040a19768adb@mail.gmail.com>
	<Pine.OSX.4.64.0602131416530.25089@piva.hawaga.org.uk>
	<Pine.LNX.4.64.0602121939070.3691@g5.osdl.org>
	<Pine.LNX.4.64.0602122049010.3691@g5.osdl.org>
	<Pine.LNX.4.64.0602122058260.3691@g5.osdl.org>
	<43F113A5.2080506@f2s.com>
	<Pine.LNX.4.63.0602141953000.22451@wbgn013.biozentrum.uni-wuerzburg.de>
	<Pine.LNX.4.64.0602141108050.3691@g5.osdl.org>
	<43F249F7.5060008@vilain.net>
	<Pine.LNX.4.64.0602141357300.3691@g5.osdl.org>
	<7vy80dpo9g.fsf@assigned-by-dhcp.cox.net>
	<Pine.LNX.4.64.0602141741210.3691@g5.osdl.org>
	<Pine.LNX.4.64.0602141811050.3691@g5.osdl.org>
	<Pine.LNX.4.64.0602141829080.3691@g5.osdl.org>
	<Pine.LNX.4.64.0602141953081.3691@g5.osdl.org>
	<7vd5hpj6ab.fsf@assigned-by-dhcp.cox.net>
	<Pine.LNX.4.64.0602151915010.916@g5.osdl.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Thu Feb 16 04:29:53 2006
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1F9Zq1-0005dc-03
	for gcvg-git@gmane.org; Thu, 16 Feb 2006 04:29:49 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932122AbWBPD3p (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Wed, 15 Feb 2006 22:29:45 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932143AbWBPD3p
	(ORCPT <rfc822;git-outgoing>); Wed, 15 Feb 2006 22:29:45 -0500
Received: from fed1rmmtao08.cox.net ([68.230.241.31]:37804 "EHLO
	fed1rmmtao08.cox.net") by vger.kernel.org with ESMTP
	id S932122AbWBPD3o (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 15 Feb 2006 22:29:44 -0500
Received: from assigned-by-dhcp.cox.net ([68.4.9.127])
          by fed1rmmtao08.cox.net
          (InterMail vM.6.01.05.02 201-2131-123-102-20050715) with ESMTP
          id <20060216032657.GKHF26964.fed1rmmtao08.cox.net@assigned-by-dhcp.cox.net>;
          Wed, 15 Feb 2006 22:26:57 -0500
To: Linus Torvalds <torvalds@osdl.org>
In-Reply-To: <Pine.LNX.4.64.0602151915010.916@g5.osdl.org> (Linus Torvalds's
	message of "Wed, 15 Feb 2006 19:25:32 -0800 (PST)")
User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux)
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/16265>

Linus Torvalds <torvalds@osdl.org> writes:

> Junio, that "traverse_trees()" logic is totally independent of whether we 
> actually do "git-merge-tree" or not, so if you want to, I could split up 
> the patches the other way (and merge "traverse_trees()" first as a new 
> interface, independently).

I won't have time to look at the actual patch tonight but I am
interested.  I think the general idea should work nice with both
multi-base and octopus merge cases as well ;-).