From owner-freebsd-doc@FreeBSD.ORG Mon Mar 5 01:46:23 2012 Return-Path: Delivered-To: doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DD7E31065675; Mon, 5 Mar 2012 01:46:23 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper-int.allbsd.org [IPv6:2001:2f0:104:e002::2]) by mx1.freebsd.org (Postfix) with ESMTP id 55AC78FC0C; Mon, 5 Mar 2012 01:46:23 +0000 (UTC) Received: from alph.allbsd.org (p1012-ipbf2105funabasi.chiba.ocn.ne.jp [114.148.160.12]) (authenticated bits=128) by mail.allbsd.org (8.14.4/8.14.4) with ESMTP id q251k1Ni035996; Mon, 5 Mar 2012 10:46:12 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.allbsd.org (8.14.4/8.14.4) with ESMTP id q251k18g058058; Mon, 5 Mar 2012 10:46:01 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Mon, 05 Mar 2012 10:45:54 +0900 (JST) Message-Id: <20120305.104554.1291167475725951413.hrs@allbsd.org> To: rene@FreeBSD.org From: Hiroki Sato In-Reply-To: <4F53F6C6.1000708@freebsd.org> References: <20120305.024113.1804223224441444882.hrs@allbsd.org> <4F53F6C6.1000708@freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.4 on Emacs 23.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Mon_Mar__5_10_45_54_2012_496)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.3 (mail.allbsd.org [133.31.130.32]); Mon, 05 Mar 2012 10:46:16 +0900 (JST) X-Spam-Status: No, score=-100.8 required=13.0 tests=BAYES_00, CONTENT_TYPE_PRESENT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,SPF_SOFTFAIL, USER_IN_WHITELIST autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on gatekeeper.allbsd.org Cc: doceng@FreeBSD.org, doc@FreeBSD.org Subject: Re: HEADS UP: CVS->SVN repository conversion 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: Mon, 05 Mar 2012 01:46:23 -0000 ----Security_Multipart(Mon_Mar__5_10_45_54_2012_496)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Rene Ladan wrote in <4F53F6C6.1000708@freebsd.org>: re> -----BEGIN PGP SIGNED MESSAGE----- re> Hash: SHA1 re> re> On 04-03-2012 18:41, Hiroki Sato wrote: re> > Hi, re> > re> > A prototype of the CVS->SVN repository conversion of the doc and www re> > tree is ready for public review. It delayed by various reasons but re> > we need to go ahead with that direction to make it possible to merge re> > useful proposals which were submitted and involving large-scale re> > changes to the tree. re> > re> > The conversion itself will be done in a straightforward way. The re> > infrastructure (ACL, commit log, etc) will be almost the same as the re> > src tree. The difference is no SVN->CVS import will be done after re> > the conversion date. re> > re> [...] re> > re> > Can you please check if there is something I am missing? Please re> > focus on technical aspects of the conversion. Detail discussions re> > about how to use the converted repository such as projects/ policy, re> > branching, etc. should be held after we can obtain the same rendering re> > results from the converted repository and other automated re> > infrastructure for mirroring works fine as before in the FreeBSD.org re> > cluster. re> > re> [snip ---- http://docsvn.allbsd.org/MIGRATION.txt] re> re> So if I understand correctly the Perforce conversion, which currently re> depends on CVS, will also be stopped? Currently the Dutch Documentation re> Project uses Perforce as a staging area, i.e.: re> re> 1) Perforce Importer takes a snapshot from the current CVS tree re> 2) 'p4 integrate -b docproj_nl' merges upstream CVS changes into the re> staging area re> 3) edit files re> 4a) 'p4 submit' submits local changes to Perforce re> 4b) 'dcvs commit' submits local changes to CVS re> re> With SVN, things would be much easier, since projects/docproj_nl could re> be used as a staging area instead, with commits happening there and re> doing a simple 'svn merge' to the main tree when things are in shape. re> But from what I read the projects/ tree is forbidden area during the re> first few weeks. Import to //depot/vendor/freebsd/{doc,www} is one of the facilities in FreeBSD.org clusters, so the source should be switched over to SVN at the same time as freeze of the CVS repo. It will not be a long period, I expect. -- Hiroki ----Security_Multipart(Mon_Mar__5_10_45_54_2012_496)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAk9UGtIACgkQTyzT2CeTzy2q1QCgx68nHyyTRrKnyeG45A0NBlKc De4An23MD0FrT+Gl0G34hsRU0v3bAlle =1w02 -----END PGP SIGNATURE----- ----Security_Multipart(Mon_Mar__5_10_45_54_2012_496)----