Re: Handling large files with GIT

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Fredrik Kuivinen

Subject: Re: Handling large files with GIT

Date: Thursday, February 16, 2006 - 1:32 pm

On Tue, Feb 14, 2006 at 07:58:03PM -0800, Linus Torvalds wrote:
quoted text> 
> 
> 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.
> 

I don't think you miss anything. I _think_ (I haven't looked at this
too close yet) that it shouldn't be too much work to make
git-merge-recursive make use of the git-merge-tree thing.

- Fredrik
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

Handling large files with GIT, Martin Langhoff, (Wed Feb 8, 2:14 am)

Re: Handling large files with GIT, Johannes Schindelin, (Wed Feb 8, 4:54 am)

Re: Handling large files with GIT, Linus Torvalds, (Wed Feb 8, 9:34 am)

Re: Handling large files with GIT, Linus Torvalds, (Wed Feb 8, 10:01 am)

Re: Handling large files with GIT, Junio C Hamano, (Wed Feb 8, 1:11 pm)

Re: Handling large files with GIT, Florian Weimer, (Wed Feb 8, 2:20 pm)

Re: Handling large files with GIT, Martin Langhoff, (Wed Feb 8, 3:35 pm)

Re: Handling large files with GIT, Greg KH, (Wed Feb 8, 9:54 pm)

Re: Handling large files with GIT, Martin Langhoff, (Wed Feb 8, 10:38 pm)

Re: Handling large files with GIT, Ben Clifford, (Sun Feb 12, 6:26 pm)

Re: Handling large files with GIT, Linus Torvalds, (Sun Feb 12, 8:42 pm)

Re: Handling large files with GIT, Martin Langhoff, (Sun Feb 12, 9:40 pm)

Re: Handling large files with GIT, Linus Torvalds, (Sun Feb 12, 9:57 pm)

Re: Handling large files with GIT, Linus Torvalds, (Sun Feb 12, 10:05 pm)

Re: Handling large files with GIT, Jeff Garzik, (Sun Feb 12, 10:55 pm)

Re: Handling large files with GIT, Keith Packard, (Sun Feb 12, 11:07 pm)

Re: Handling large files with GIT, Linus Torvalds, (Mon Feb 13, 9:19 am)

Re: Handling large files with GIT, Ian Molton, (Mon Feb 13, 4:17 pm)

Re: Handling large files with GIT, Martin Langhoff, (Mon Feb 13, 4:19 pm)

Re: Handling large files with GIT, Martin Langhoff, (Mon Feb 13, 5:07 pm)

Re: Handling large files with GIT, Johannes Schindelin, (Tue Feb 14, 11:56 am)

Re: Handling large files with GIT, Linus Torvalds, (Tue Feb 14, 12:52 pm)

Re: Handling large files with GIT, Sam Vilain, (Tue Feb 14, 2:21 pm)

Re: Handling large files with GIT, Linus Torvalds, (Tue Feb 14, 3:01 pm)

Re: Handling large files with GIT, Junio C Hamano, (Tue Feb 14, 3:30 pm)

Re: Handling large files with GIT, Sam Vilain, (Tue Feb 14, 5:40 pm)

Re: Handling large files with GIT, Junio C Hamano, (Tue Feb 14, 6:39 pm)

Re: Handling large files with GIT, Linus Torvalds, (Tue Feb 14, 7:05 pm)

Re: Handling large files with GIT, Martin Langhoff, (Tue Feb 14, 7:07 pm)

Re: Handling large files with GIT, Linus Torvalds, (Tue Feb 14, 7:18 pm)

Re: Handling large files with GIT, Linus Torvalds, (Tue Feb 14, 7:33 pm)

Re: Handling large files with GIT, Linus Torvalds, (Tue Feb 14, 8:58 pm)

Re: Handling large files with GIT, Sam Vilain, (Tue Feb 14, 9:03 pm)

Re: Handling large files with GIT, Junio C Hamano, (Wed Feb 15, 2:54 am)

Re: Handling large files with GIT, Linus Torvalds, (Wed Feb 15, 8:44 am)

Re: Handling large files with GIT, Linus Torvalds, (Wed Feb 15, 10:16 am)

Re: Handling large files with GIT, Linus Torvalds, (Wed Feb 15, 8:25 pm)

Re: Handling large files with GIT, Junio C Hamano, (Wed Feb 15, 8:29 pm)

Re: Handling large files with GIT, Fredrik Kuivinen, (Thu Feb 16, 1:32 pm)