Re: Handling large files with GIT

From: Linus Torvalds <torvalds@osdl.org>
Date: Feb 15, 2006, 03:58 UTC
Message-ID: <Pine.LNX.4.64.0602141953081.3691@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0602141829080.3691@g5.osdl.org>

On Tue, 14 Feb 2006, Linus Torvalds wrote:

Show 6 quoted lines

> 
> So in case people want to try, here's a third patch. Oh, and it's against 
> my _original_ path, not incremental to the middle one (ie both patches two 
> and three are against patch #1, it's not a nice series).
> 
> Now I'm really done, and won't be sending out any more patches today.

Still true. I've just been thinking about the last state.

As far as I can tell, the output from git-merge-tree with that fix to only simplify subdirectories that match exactly in all of base/branch1/branch2 is precisely the output that git-merge-recursive actually wants.

Rather than doing a three-way merge with "git-read-tree", and then doing "git-ls-files --unmerged", I think this gives the same result much more efficiently.

That said, I can't follow the python code, so maybe I'm missing something. Fredrik cc'd, in case he can put me right.

		Linus