Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Fri, 7 Mar 2003 05:59:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Fri, 7 Mar 2003 05:58:40 -0500 Received: from [195.39.17.254] ([195.39.17.254]:2564 "EHLO Elf.ucw.cz") by vger.kernel.org with ESMTP id ; Fri, 7 Mar 2003 05:57:05 -0500 Date: Thu, 6 Mar 2003 17:47:43 +0100 From: Pavel Machek To: Joel Becker Cc: Jeff Garzik , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: Re: BitBucket: GPL-ed *notrademarkhere* clone Message-ID: <20030306164743.GG2781@zaurus.ucw.cz> References: <200303020011.QAA13450@adam.yggdrasil.com> <3E615C38.7030609@pobox.com> <20030302014039.GC1364@dualathlon.random> <3E616224.6040003@pobox.com> <3E623B9A.8050405@pobox.com> <20030303215356.GE2835@ca-server1.us.oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030303215356.GE2835@ca-server1.us.oracle.com> User-Agent: Mutt/1.3.27i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 761 Lines: 21 Hi! > The one thing BK does that makes it worthwhile is the three-way > merge. This (and the resulting DAG) make handling code from Alan, from > Linus, from Andrew, and from everyone else possible. With CVS, > subversion, or any other SCM I've worked with, you have to hand merge > anything past the first patch. Ugh. What's so magical about 3way merge? I thought it would be easy to do even in CVS... Pavel -- Pavel Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need... - 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/