From: Linus Torvalds Date: Tue, 26 Apr 2005 04:22:58 GMT Subject: Re: Mercurial 0.3 vs git benchmarks Message-ID: In-Reply-To: <20050426040933.GA21178@taniwha.stupidest.org> On Mon, 25 Apr 2005, Chris Wedgwood wrote: > > On Mon, Apr 25, 2005 at 07:08:28PM -0700, Linus Torvalds wrote: > > > If you're checking in a change to 1000+ files, you're doing > > something wrong. > > arch or subsystem merge? No, if it's a merge, you just suck in all the already-compressed objects. You never compress anything new - you get the objects, you update your tree index, and you're done. No overhead anywhere - a clean merge may _look_ like it's changing thousands of files, but it didn't change a single _object_ anywhere, it just re-arranged the objects and created a new view of them. Most merges are literally just a tree-level thing. Sometimes you have to do a content merge, but that tends to be a file or two. Linus