From: Linus Torvalds Date: Wed, 15 Feb 2006 03:58:03 GMT Subject: Re: Handling large files with GIT Message-ID: In-Reply-To: On Tue, 14 Feb 2006, Linus Torvalds wrote: > > 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