From owner-freebsd-doc@FreeBSD.ORG Fri Oct 7 21:33:46 2011 Return-Path: Delivered-To: doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6766D106566C; Fri, 7 Oct 2011 21:33:46 +0000 (UTC) (envelope-from gavin.atkinson@ury.york.ac.uk) Received: from ixe-mta-27.emailfiltering.com (ixe-mta-27-tx.emailfiltering.com [194.116.199.158]) by mx1.freebsd.org (Postfix) with ESMTP id 5D49C8FC12; Fri, 7 Oct 2011 21:33:45 +0000 (UTC) Received: from mail-gw5.york.ac.uk ([144.32.129.29]) by ixe-mta-27.emailfiltering.com with emfmta (version 4.8.3.54) by TLS id 1318217366 for rene@freebsd.org; 85edd3fea9e31876; Fri, 07 Oct 2011 22:15:58 +0100 Received: from ury.york.ac.uk ([144.32.108.81]:33218) by mail-gw5.york.ac.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1RCHlu-0002VG-5x; Fri, 07 Oct 2011 22:15:58 +0100 Received: from gavin (helo=localhost) by ury.york.ac.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1RCHlt-0006IC-Vq; Fri, 07 Oct 2011 22:15:58 +0100 Date: Fri, 7 Oct 2011 22:15:57 +0100 (BST) From: Gavin Atkinson X-X-Sender: gavin@ury.york.ac.uk To: Rene Ladan In-Reply-To: <4E8F0AA2.3020704@freebsd.org> Message-ID: References: <20111007141312.GJ26743@acme.spoerlein.net> <4E8F0AA2.3020704@freebsd.org> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: Cc: doceng@FreeBSD.org, doc@FreeBSD.org, =?ISO-8859-15?Q?Ulrich_Sp=F6rlein?= 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: Fri, 07 Oct 2011 21:33:46 -0000 On Fri, 7 Oct 2011, Rene Ladan wrote: > Op 07-10-2011 16:13, Ulrich Sp?rlein schreef: > > it looks like I'm not the only one thinking about moving the doc/www > > repos from CVS to SVN, and other people actually have not only thought > > about it but already played around with conversions. > > > > gavin did some preliminary conversions and it turns out that we end up > > with ~50k revisions and about 650MB of changes (IIRC). There are also > > lots of weird branches, so perhaps we could size that down a bit. > > > > What I, personally, would like to see is us using the same svn repo as > > src. That means we would have to stop svn.freebsd.org for the > > conversion, turn off email sending, dump 50k revisions into it (under > > /doc and /www perhaps? where should branches/tags end up?), then turn > > everything back on. The more I think about this, the less I like the idea. I really don't like the idea of having revision numbers which no longer increase with commit date (i.e. having revisions 1-250,000 correspond to the existing src tree, 250,000-300,000 being the imported doc tree, and then the combined repo being 300,001 onwards). I think it is much nicer to have two separate repositories, in which revision 1 corresponds to the start of each tree. I don't see any real advantage in combining them now, to be honest. Combining doc and www more closely, however, I do see the benefit of. However, currently we don't (and have no need to) branch the www tree with each release. If we combine them, we would be - even though we probably don't wish to. Gavin > > I haven't really thought that through to the end, but setting up a > > separate svn repo just seems silly to me and is another administrative > > overhead. ports might be special enough (due to sheer size) to justify a > > separate repo/machine, but not doc/www. It may actually be easier, as all the infrastructure from the src repo can possibly be reused easily. Combining them may be harder as more work would presumably need to be done on sorting out ACLs for src and doc committers, etc? > If possible, I would like to have one SVN repository for both src and > doc/www so that user and project directories can be shared so that there > is only one /user/rene. An argument could be made that by keeping them separate then it reduces the overhead for people wishing to contribute. People wanting to commit a kernel patch need a copy of the website on their disk just as much as people wanting to edit the website need the kernel source. Having them separate allows these two distinct groups to not need to check out reams of data they don't actually need. > Another advantage of converting to SVN is that the docproj_nl stuff can > go into /projects/docproj_nl on SVN so that there is no need for yet > another VCS (p4 in this case) any longer. Absolutely, I think the conversion to SVN is a certainty, for this and a lot of other reasons. Gavin