From owner-freebsd-doc@FreeBSD.ORG Sat Oct 22 04:00:12 2011 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id EDEB31065676; Sat, 22 Oct 2011 04:00:10 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 5AFD3161743; Sat, 22 Oct 2011 04:00:10 +0000 (UTC) Message-ID: <4EA23FCA.10309@FreeBSD.org> Date: Fri, 21 Oct 2011 21:00:10 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: John Baldwin References: <20111007141312.GJ26743@acme.spoerlein.net> <20111008120446.GU26743@acme.spoerlein.net> <4084CDBA-C96D-4D3E-9F99-9F64C68B187D@nitro.dk> <201110101301.37276.jhb@freebsd.org> In-Reply-To: <201110101301.37276.jhb@freebsd.org> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: doc@freebsd.org, doceng@freebsd.org, freebsd-doc@freebsd.org, =?ISO-8859-1?Q?Sp=F6rlein?= , "Simon L. B. Nielsen" , Ulrich@FreeBSD.ORG Subject: Re: Conversion to SVN X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 04:00:12 -0000 On 10/10/2011 10:01, John Baldwin wrote: > On Saturday, October 08, 2011 12:16:59 pm Simon L. B. Nielsen wrote: >>>> I'm not really sure where you would fit doc into the current repo... >>>> head/ etc. is on the top level. >>> >>> /doc and /www would be the obvious choices. Ed even jokingly (??) said >> >> Well, that seems like a bit of a mess as you mainly have branches at that level... >> >>> we should just rename /head to /src ... not sure I concur. >> >> Considering we have stable etc. on the same level that seems like a bad thing to do... > > I agree with both of these. The layout in svn currently is src-centric and > only setup to handle src. Right now under base/ we have: cvs2svn head projects release releng stable svnadmin user vendor vendor-crypto vendory-sys ROADMAP.TXT Those categories are primarily source-related, but not exclusively. > You would need to move the entire repo down into a > new "src" directory for it to really work, but we aren't going to do that now. > I think a separate SVN for doc+www is fine (and not near as much overhead to > manage as Ulrich fears). My primary motivating factor is not the administrative overhead, it's the fact that elements from the doc repo are used as part of 'make release.' > Also, I think the discontinuous history idea is a compelling reason to not put > the doc/www history into source svn. Right now svn changes move forward > continuously with time (so change N + 1 is "newer" than change N), but > importing doc+www history as changes that are subsequent to the current top of > tree would break that. OTOH, renumbering the current tree to put the doc+www > history in the "right" place is simply not workable now. I don't understand any of what you wrote above, but I'd like to. What I'm thinking is that the cvs->svn converter would simply start with the next available revision number and that would be the first revision for the oldest doc commit. When the import was done, the revision numbers would continue to increase monotonically regardless of whether it was a doc or src commit. Are you saying that this is not how it would work? Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/