Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S310278AbSCKRNL>; Mon, 11 Mar 2002 12:13:11 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S310255AbSCKRNF>; Mon, 11 Mar 2002 12:13:05 -0500
Received: from air-2.osdl.org ([65.201.151.6]:31246 "EHLO osdlab.pdx.osdl.net")
	by vger.kernel.org with ESMTP id <S310278AbSCKRMv>;
	Mon, 11 Mar 2002 12:12:51 -0500
Date: Mon, 11 Mar 2002 09:12:31 -0800 (PST)
From: "Randy.Dunlap" <rddunlap@osdl.org>
X-X-Sender: <rddunlap@dragon.pdx.osdl.net>
To: Larry McVoy <lm@bitmover.com>
cc: Rik van Riel <riel@conectiva.com.br>,
        "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.33L2.0203110911530.3326-100000@dragon.pdx.osdl.net>
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
|
| that's a 3 way file merge, the 2 big side by side windows are showing
| you 3 diffs, the diff from the ancestor to the local version in the left
| window, the diff from the ancestor to the remote version in the right
| window, and then side by side diffs in that they are lined up.
|
| 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.

Just curious, how is this productivity increase measured?

Thanks,
-- 
~Randy

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