From owner-freebsd-current@FreeBSD.ORG Mon Mar 8 00:02:12 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1A451065673; Mon, 8 Mar 2010 00:02:12 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id B40BC8FC08; Mon, 8 Mar 2010 00:02:12 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.4/8.14.4) with ESMTP id o28024Y0089676; Sun, 7 Mar 2010 16:02:04 -0800 (PST) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.4/8.14.4/Submit) id o280235A089675; Sun, 7 Mar 2010 16:02:03 -0800 (PST) (envelope-from obrien) Date: Sun, 7 Mar 2010 16:02:03 -0800 From: "David O'Brien" To: "M. Warner Losh" Message-ID: <20100308000203.GA70486@dragon.NUXI.org> Mail-Followup-To: obrien@freebsd.org, "M. Warner Losh" , phk@phk.freebsd.dk, freebsd-current@FreeBSD.org, rwatson@FreeBSD.org, ddkprog@yahoo.com References: <3620.1267780989@critter.freebsd.dk> <20100307054423.GE70613@dragon.NUXI.org> <20100307.144904.1125936742922092260.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100307.144904.1125936742922092260.imp@bsdimp.com> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.16 (2007-06-09) Cc: phk@phk.freebsd.dk, freebsd-current@FreeBSD.org, rwatson@FreeBSD.org, ddkprog@yahoo.com Subject: Re: propose: all arch move into a separate dir X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2010 00:02:13 -0000 On Sun, Mar 07, 2010 at 02:49:04PM -0700, M. Warner Losh wrote: > In message: <20100307054423.GE70613@dragon.NUXI.org> > "David O'Brien" writes: > : On Fri, Mar 05, 2010 at 09:41:40AM +0000, Robert Watson wrote: > : > On Fri, 5 Mar 2010, Poul-Henning Kamp wrote: > : >> In message , Robert > : >> Watso n writes: > : >>> Doing that kind of rearrangement [...] would be a nightmare for anyone > : >>> with large [...] patches, so I'd say we could pretty much rule that out > : >>> outright. > : >> > : >> I would say that we should do it occasionally, to encourage these > : >> FreeBSD users to contribute as many of their local changes back to > : >> the project, as possible :-) > : > > : > Absolutely -- and rearranging a tree is a good way to invalidate > : > all those patches as well :-). > : > : No, not it isn't. Provide a script to convert path's in the diff. > : This is what $LARGE_FREEBSD_USER did when it rearranged it source tree. > > You are joking, right? This would be a nightmare for people that > integrate early and often. No I am not joking. I was responding to the point that a large patch (that is a the output of running '$SCM diff') can be easily modified to match a new directory layout. Thus patches in GNATS aren't "useless". I'm not sure what operation you are specifically speaking to . But, if FreeBSD were to move the CPU directories under 'arch/', at $WORK we would do: cd sys mkdir arch svn add arch svn mv {list of dirs} arch svn ci and be done with it. Branches would merge that change - get a trivial tree conflict, resolve it - and move on with life. I would expect folks working in project branches to do the same. For merging changes from FreeBSD HEAD to FreeBSD stable - that is trivial: cd sys svn merge -c $GRN ^/head/sys/arch/amd64 amd64 svn ci Subversion makes this a lot easier than CVS did. -- -- David (obrien@FreeBSD.org)