From owner-freebsd-doc@FreeBSD.ORG Sun Mar 4 17:49:09 2012 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 48043106566C; Sun, 4 Mar 2012 17:49:09 +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 4509C8FC14; Sun, 4 Mar 2012 17:49:08 +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 q24HmjXV055365; Mon, 5 Mar 2012 02:48:56 +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 q24Hmi6r054205; Mon, 5 Mar 2012 02:48:45 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Mon, 05 Mar 2012 02:41:13 +0900 (JST) Message-Id: <20120305.024113.1804223224441444882.hrs@allbsd.org> To: doc@FreeBSD.org From: Hiroki Sato 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_02_41_13_2012_616)--" 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 02:49:01 +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 Subject: 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: Sun, 04 Mar 2012 17:49:09 -0000 ----Security_Multipart(Mon_Mar__5_02_41_13_2012_616)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, A prototype of the CVS->SVN repository conversion of the doc and www tree is ready for public review. It delayed by various reasons but we need to go ahead with that direction to make it possible to merge useful proposals which were submitted and involving large-scale changes to the tree. The conversion itself will be done in a straightforward way. The infrastructure (ACL, commit log, etc) will be almost the same as the src tree. The difference is no SVN->CVS import will be done after the conversion date. The following is descriptions of the prototype and migration plan. You can try to check out the tree while the URL of the repository is a temporary one, of course. As explained in the document, the date when it happens is just after 8.3-RELEASE (currently set to April 7). It might be changed slightly but April is the target. Can you please check if there is something I am missing? Please focus on technical aspects of the conversion. Detail discussions about how to use the converted repository such as projects/ policy, branching, etc. should be held after we can obtain the same rendering results from the converted repository and other automated infrastructure for mirroring works fine as before in the FreeBSD.org cluster. ---- http://docsvn.allbsd.org/MIGRATION.txt ---- CVS->SVN conversion of the doc and www Repositories 1. Repository Layout You can checkout the converted repository by using: % svn co http://docsvn.allbsd.org/base The repository layout in the URL is the following: doc/ www/ release/[0-9]+.[0-9]+.[0-9]+ branches/ user/ projects/ svnadmin/ Note that this is temporary one for conversion and please read the final one explained below. The doc/ and www/ are trunk of each existing repository converted from CVS. Symbolic tags are converted to release/* (the rule "RELEASE_\d+_\d+_\d+ -> release/\1.\2/\3" was applied here). Most of meaningless tags were eliminated. The branches/* were needed only for conversion purpose (technical reason). This means they will be removed by svn rm soon. Some discussions were held about branching of contents such as Handbook but there will be no management policy change at the moment of this conversion. user/, projects/, and svnadmin/ are for the same purpose as the src repository (empty at this moment). After this converted repository is populated, the following steps will be followed: a) deprecate branches/ by simple svn rm b) do svn cp of "www/" to "doc//htdocs" c) deprecate www/ after updating build infrastructure So, the final layout will be the following: doc/ release/[0-9]+.[0-9]+.[0-9]+ user/ projects/ svnadmin/ 2. Migration Plan 2-1) Freeze the current CVS repository on Saturday, April 7 (after 8.3R release date). No more commit to the CVS repository after this freeze. Populate the converted SVN repository, and commit necessary changes for repository administration, build infrastructure for www.FreeBSD.org, and etc. just after that. 2-2) Apply www/ -> doc//htdocs change and commit necessary changes for the www build. This is basically a directory renaming and merge of duplicate parts in www/share and doc/share. This will be done just after 2-1). 2-3) Open the converted repository for doc committers within that day if there is no major problem. Notes: a) No automatic SVN->CVS import after the conversion like the src repository. This is because it is not reliable and deprecating CVS support of the doc and www repository should have a limited impact for most of people. b) We will have to see how well the migration goes for a while after the conversion date. I think 2 or 3 weeks are enough. More specifically, for that period, normal commits to the doc/ directory are allowed but sweeping changes or using user/ and projects/ are not allowed. After such a period, let us use user/ and projects/ for large projects like Handbook reorganization and SGML->XML conversion. ---- -- Hiroki ----Security_Multipart(Mon_Mar__5_02_41_13_2012_616)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAk9TqTkACgkQTyzT2CeTzy3JhwCeOVHzLroWnyM8/r/pUckB0k6Q FZgAnjebMJ4Xc7GFEazJmNJQPcAEiUud =elOK -----END PGP SIGNATURE----- ----Security_Multipart(Mon_Mar__5_02_41_13_2012_616)----