Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S292883AbSCKUuX>; Mon, 11 Mar 2002 15:50:23 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S292983AbSCKUuN>; Mon, 11 Mar 2002 15:50:13 -0500
Received: from garrincha.netbank.com.br ([200.203.199.88]:11524 "HELO
	netbank.com.br") by vger.kernel.org with SMTP id <S292883AbSCKUuD>;
	Mon, 11 Mar 2002 15:50:03 -0500
Date: Mon, 11 Mar 2002 17:36:23 -0300 (BRT)
From: Rik van Riel <riel@conectiva.com.br>
X-X-Sender: riel@imladris.surriel.com
To: Larry McVoy <lm@bitmover.com>
Cc: "Jonathan A. George" <JGeorge@greshamstorage.com>,
        <linux-kernel@vger.kernel.org>
Subject: Re: Kernel SCM: When does CVS fall down where it REALLY matters?
In-Reply-To: <20020311090512.N26447@work.bitmover.com>
Message-ID: <Pine.LNX.4.44L.0203111731420.2181-100000@imladris.surriel.com>
X-spambait: aardvark@kernelnewbies.org
X-spammeplease: aardvark@nl.linux.org
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 11 Mar 2002, Larry McVoy wrote:
> On Thu, Mar 07, 2002 at 08:59:47PM -0300, Rik van Riel wrote:
> > 3) graphical 2-way merging tool like bitkeeper has
> >    (this might not seem essential to people who have
> >    never used it, but it has saved me many many hours)
>
> I haven't verified this, but I suspect what Rik is using is the 3-way
> file merge.  If it looks like
>
> 	http://www.bitkeeper.com/newmerge.gif

Actually, I've tried both the 3-way and the 2-way merge tools ...

> If Rik is using the 2 way file merge and likes that, he's in for a
> quantum leap in productivity, commercial customers have reported as much
> as an 18:1 productivity increase from the 3 way file merge.

... and I prefer the one which is chosen with 'f2', nothing beats
the [left] [right] buttons!

I guess maybe 10% of the time I need to edit something by hand,
but by far the most of the time I can just choose the code variant
on the left or on the right.

One mouse click is so much easier and faster than editing 5 lines
of code.

regards,

Rik
-- 
<insert bitkeeper endorsement here>

http://www.surriel.com/		http://distro.conectiva.com/

-
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/