Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262042AbVDLIh0 (ORCPT ); Tue, 12 Apr 2005 04:37:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262059AbVDLIhZ (ORCPT ); Tue, 12 Apr 2005 04:37:25 -0400 Received: from witte.sonytel.be ([80.88.33.193]:29861 "EHLO witte.sonytel.be") by vger.kernel.org with ESMTP id S262042AbVDLIhK (ORCPT ); Tue, 12 Apr 2005 04:37:10 -0400 Date: Tue, 12 Apr 2005 10:36:49 +0200 (CEST) From: Geert Uytterhoeven To: Daniel Barkalow cc: Linus Torvalds , Jeff Garzik , Benjamin Herrenschmidt , Linux Kernel list , James Bottomley , David Woodhouse Subject: Re: New SCM and commit list In-Reply-To: Message-ID: References: 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 Content-Length: 1049 Lines: 26 On Mon, 11 Apr 2005, Daniel Barkalow wrote: > If merge took trees instead of single files, and had some way of detecting > renames (or it got additional information about the differences between > files), would that give BK-quality performance? Or does BK also support I wrote a script to do merges on a tree (so far without rename detection, though ;-) a long time ago, and still use it every time Linus or Marcelo release a new version. Look at `mergetree' on http://linux-m68k-cvs.ubb.ca/~geert/ Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - 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/