Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S266361AbUF0GmI (ORCPT ); Sun, 27 Jun 2004 02:42:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S266287AbUF0Gl1 (ORCPT ); Sun, 27 Jun 2004 02:41:27 -0400 Received: from fw.osdl.org ([65.172.181.6]:11940 "EHLO mail.osdl.org") by vger.kernel.org with ESMTP id S266277AbUF0GlZ (ORCPT ); Sun, 27 Jun 2004 02:41:25 -0400 Date: Sat, 26 Jun 2004 23:40:25 -0700 From: Andrew Morton To: Paul Jackson Cc: jdike@addtoit.com, blaisorblade_spam@yahoo.it, linux-kernel@vger.kernel.org Subject: Re: Inclusion of UML in 2.6.8 Message-Id: <20040626234025.7d69937c.akpm@osdl.org> In-Reply-To: <20040626233253.06ed314e.pj@sgi.com> References: <200406261905.22710.blaisorblade_spam@yahoo.it> <20040626130945.190fb199.akpm@osdl.org> <20040627035923.GB8842@ccure.user-mode-linux.org> <20040626233253.06ed314e.pj@sgi.com> X-Mailer: Sylpheed version 0.9.7 (GTK+ 1.2.10; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1966 Lines: 45 Paul Jackson wrote: > > > I'm looking at quilt > > Good tool. > > It's a bit like a loaded gun with no safety. You will learn a few new > ways to shoot your foot off, and become good at first aid. You will > want someway to keep personal revision history of your patches, to aid > in such repair work. CVS or RCS or local bitkeeper or (for ancient > hackers like me) raw SCCS or some such. Quilt handles the patches, but > in and of itself has nothing to do with preserving history. > > All software is divided into two parts - the concrete and the fluid. > > Once something is accepted into the main kernel, it's concrete. You can > never go back - you can only layer fixes on top. Bitkeeper rules for > this stuff. > > But work in progress, for which oneself is still the primary source, is > fluid. You can slice and dice and redo it, and indeed you want to, to > get the best patch set. Quilt and friends rule for this stuff. Good description, that. quilt is a grown-up version of patch-scripts, and is tailored to what I do, and to what distributors do: maintain a series of diffs against a monolithic tree which someone else maintains. > Conclusion - use Quilt (with your favorite personal version control) on > top of Bitkeeper. yup. I use patch-scripts+CVS in the way which you describe. > Question - what tools are available for convenient patch set submission? > Composing multiple, related email sets in a GUI emailer is a bit tedious > and error prone. It's an obvious candidate for scripting. patch-scripts has the "patch-bomb" script, which would presumably work OK for quilt - it would need a little tweaking. http://www.zip.com.au/~akpm/linux/patches/patch-scripts-0.18/ - 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/