From owner-freebsd-current@FreeBSD.ORG Mon Mar 8 06:16:02 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 87174106566B for ; Mon, 8 Mar 2010 06:16:02 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4A2788FC08 for ; Mon, 8 Mar 2010 06:16:02 +0000 (UTC) Received: by pvg3 with SMTP id 3so1911535pvg.13 for ; Sun, 07 Mar 2010 22:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=sNhVmNYOoDHWjqUexhqv+8Tw1EC/VxQk/d+smvU1oNk=; b=pwDz0YHWRSs5P3QluDXPKOLYJXD9Z0eqkrkfJniVw0XVjzLEeECKEvOfAnVYwTIiVG c0FuyKUSoR8bXlQUPMgONMFkSPOHSbNRyvk8f7kXDRr2+k4Z3cEa7LClfBRhUQofZwwQ toMIi1jls8UHdCP9brpQbOtZIfkhIPIo6kcmM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Sq1WG+jLL1swviFFPQwwrP+H6RL4BfBeYakZN/BeF2gbmDRseIICqxmQ5Y1MG1vnlk wETQKrnOf5xdjH96D1PTGrtJFg4fdFyLJ10/f8pkJ9o2iUCnoX0q8PGLOWIzW48/ZepI +31ODk2YQw4HM9kQAvgILgtzURcWm+2Dm0IvY= MIME-Version: 1.0 Received: by 10.142.3.28 with SMTP id 28mr2948724wfc.106.1268028961658; Sun, 07 Mar 2010 22:16:01 -0800 (PST) In-Reply-To: <20100307.174906.122313684076180456.imp@bsdimp.com> References: <20100307054423.GE70613@dragon.NUXI.org> <20100307.144904.1125936742922092260.imp@bsdimp.com> <20100308000203.GA70486@dragon.NUXI.org> <20100307.174906.122313684076180456.imp@bsdimp.com> Date: Sun, 7 Mar 2010 22:16:01 -0800 Message-ID: <7d6fde3d1003072216s65b814f1s3ab04d2a6d626e57@mail.gmail.com> From: Garrett Cooper To: "M. Warner Losh" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 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 06:16:02 -0000 On Sun, Mar 7, 2010 at 4:49 PM, M. Warner Losh wrote: > In message: <20100308000203.GA70486@dragon.NUXI.org> > =A0 =A0 =A0 =A0 =A0 =A0"David O'Brien" writes: > : On Sun, Mar 07, 2010 at 02:49:04PM -0700, M. Warner Losh wrote: > : > In message: <20100307054423.GE70613@dragon.NUXI.org> > : > =A0 =A0 =A0 =A0 =A0 =A0 "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 thes= e > : > : >> 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. =A0Provide a script to convert path's in the diff= . > : > : This is what $LARGE_FREEBSD_USER did when it rearranged it source t= ree. > : > > : > You are joking, right? =A0This would be a nightmare for people that > : > integrate early and often. > : > : > : No I am not joking. =A0I 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. =A0Thus patches in GNATS aren't "useless"= . > > It seems like it would be a nightmare for anybody tracking the system > on a regular basis. > > : 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 wou= ld > : do: > : > : =A0 =A0 cd sys > : =A0 =A0 mkdir arch > : =A0 =A0 svn add arch > : =A0 =A0 svn mv {list of dirs} arch > : =A0 =A0 svn ci > : > : and be done with it. =A0Branches would merge that change - get a trivia= l > : tree conflict, resolve it - and move on with life. > > And everybody who was tracking FreeBSD with their own changes would > have to scramble. =A0It wouldn't be trivial by any stretch of the > imagination. =A0The project is much larger than svn, and svn doesn't > lend itself well to having external agents track it. > > : I would expect folks working in project branches to do the same. > : > : For merging changes from FreeBSD HEAD to FreeBSD stable - that is > : trivial: > : > : =A0 =A0 cd sys > : =A0 =A0 svn merge -c $GRN ^/head/sys/arch/amd64 amd64 > : =A0 =A0 svn ci > : > : Subversion makes this a lot easier than CVS did. > > Just because the task is doable with svn, where it was impossible with > CVS doesn't mean there wouldn't be a significant amount of pain to the > folks using FreeBSD. =A0It is cool that Juniper kinda has it worked out, > but even there I'm skeptical about your claims. =A0Especially since > Juniper imports source rarely, where as other firms do it more often, > and there'd be more pain for them. There are also folks (like Ironport) who don't import changes back into the tree as often, and I'd rather not put more of a crimp on folks' time for getting things back in because of this forced CVS -> SVN upgrade (I'd rather convince others gradually over time to switch to svn as opposed to using CVS). As long as CVS continues to be in base, some folks will prefer it over SVN (not saying because it's better, but just because it's there and it's established). Thanks, -Garrett