Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261716AbVDKHjP (ORCPT ); Mon, 11 Apr 2005 03:39:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261717AbVDKHjP (ORCPT ); Mon, 11 Apr 2005 03:39:15 -0400 Received: from mx2.elte.hu ([157.181.151.9]:1976 "EHLO mx2.elte.hu") by vger.kernel.org with ESMTP id S261716AbVDKHjK (ORCPT ); Mon, 11 Apr 2005 03:39:10 -0400 Date: Mon, 11 Apr 2005 09:38:44 +0200 From: Ingo Molnar To: Linus Torvalds Cc: Jeff Garzik , Benjamin Herrenschmidt , Linux Kernel list , James Bottomley , David Woodhouse , Chris Mason Subject: Re: New SCM and commit list Message-ID: <20050411073844.GA5485@elte.hu> References: <1113174621.9517.509.camel@gaston> <425A10EA.7030607@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i X-ELTE-SpamVersion: MailScanner 4.31.6-itk1 (ELTE 1.2) SpamAssassin 2.63 ClamAV 0.73 X-ELTE-VirusStatus: clean X-ELTE-SpamCheck: no X-ELTE-SpamCheck-Details: score=-4.9, required 5.9, autolearn=not spam, BAYES_00 -4.90 X-ELTE-SpamLevel: X-ELTE-SpamScore: -4 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1622 Lines: 37 * Linus Torvalds wrote: > Then the bad news: the merge algorithm is going to suck. It's going to > be just plain 3-way merge, the same RCS/CVS thing you've seen before. > With no understanding of renames etc. I'll try to find the best parent > to base the merge off of, although early testers may have to tell the > piece of crud what the most recent common parent was. > > So anything that got modified in just one tree obviously merges to > that version. Any file that got modified in two trees will end up just > being passed to the "merge" program. See "man merge" and "man diff3". > The merger gets to fix up any conflicts by hand. at that point Chris Mason's "rej" tool is pretty nifty: ftp://ftp.suse.com/pub/people/mason/rej/rej-0.13.tar.gz it gets the trivial rejects right, and is pretty powerful to quickly cycle through the nontrivial ones too. It shows the old and new code side by side too, etc. (There is no fully automatic mode in where it would not bother the user with the really trivial rejects - but it has an automatic mode where you basically have to do nothing - maybe a fully automatic one could be added that would resolve low-risk rejects?) it's really easy to use (but then again i'm a vim user, so i'm biased), just try it on a random .rej file you have ("rej -a kernel/sched.c.rej" or whatever). Ingo - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/