Date: Sat, 05 May 2012 07:34:32 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: doc@FreeBSD.org Cc: doceng@FreeBSD.org Subject: Re: HEADS UP: CVS->SVN repository conversion Message-ID: <20120505.073432.1340981733888578154.hrs@allbsd.org> In-Reply-To: <20120305.024113.1804223224441444882.hrs@allbsd.org> References: <20120305.024113.1804223224441444882.hrs@allbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart(Sat_May__5_07_34_32_2012_559)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi all, This is another heads-up about the cvs->svn repo conversion. It is delayed a bit from the original schedule but it will be finished this weekend or early next week. A preliminary svn repository is already at svn://svn.FreeBSD.org/doc. Note that this is not the final version and may be changed without notice. The repository layout will be what I wrote except for the top level doc/ directory. The URL svn://svn.FreeBSD.org/doc/doc is confusing, so I changed it to "head". svn://svn.FreeBSD.org/doc/head is equivalent to the current "doc" repository. I will send an announcement again just before the repository migration takes place. At the time of the announcement both of the CVS and SVN repository will be frozen and then the SVN repository will be unfrozen after checking if webupdate script works fine on www.FreeBSD.org. I takes 24 hours at the longest. Hiroki Sato <hrs@FreeBSD.org> wrote in <20120305.024113.1804223224441444882.hrs@allbsd.org>: hr> Hi, hr> hr> A prototype of the CVS->SVN repository conversion of the doc and www hr> tree is ready for public review. It delayed by various reasons but hr> we need to go ahead with that direction to make it possible to merge hr> useful proposals which were submitted and involving large-scale hr> changes to the tree. hr> hr> The conversion itself will be done in a straightforward way. The hr> infrastructure (ACL, commit log, etc) will be almost the same as the hr> src tree. The difference is no SVN->CVS import will be done after hr> the conversion date. hr> hr> The following is descriptions of the prototype and migration plan. hr> You can try to check out the tree while the URL of the repository is hr> a temporary one, of course. As explained in the document, the date hr> when it happens is just after 8.3-RELEASE (currently set to April 7). hr> It might be changed slightly but April is the target. hr> hr> Can you please check if there is something I am missing? Please hr> focus on technical aspects of the conversion. Detail discussions hr> about how to use the converted repository such as projects/ policy, hr> branching, etc. should be held after we can obtain the same rendering hr> results from the converted repository and other automated hr> infrastructure for mirroring works fine as before in the FreeBSD.org hr> cluster. hr> hr> ---- http://docsvn.allbsd.org/MIGRATION.txt ---- hr> hr> CVS->SVN conversion of the doc and www Repositories hr> hr> 1. Repository Layout hr> hr> You can checkout the converted repository by using: hr> hr> % svn co http://docsvn.allbsd.org/base hr> hr> The repository layout in the URL is the following: hr> hr> doc/ hr> www/ hr> release/[0-9]+.[0-9]+.[0-9]+ hr> branches/ hr> user/ hr> projects/ hr> svnadmin/ hr> hr> Note that this is temporary one for conversion and please read the hr> final one explained below. The doc/ and www/ are trunk of each hr> existing repository converted from CVS. Symbolic tags are converted hr> to release/* (the rule "RELEASE_\d+_\d+_\d+ -> release/\1.\2/\3" hr> was applied here). Most of meaningless tags were eliminated. hr> hr> The branches/* were needed only for conversion purpose (technical hr> reason). This means they will be removed by svn rm soon. Some hr> discussions were held about branching of contents such as Handbook hr> but there will be no management policy change at the moment of hr> this conversion. hr> hr> user/, projects/, and svnadmin/ are for the same purpose as the src hr> repository (empty at this moment). hr> hr> After this converted repository is populated, the following steps hr> will be followed: hr> hr> a) deprecate branches/ by simple svn rm hr> b) do svn cp of "www/<lang>" to "doc/<lang>/htdocs" hr> c) deprecate www/ after updating build infrastructure hr> hr> So, the final layout will be the following: hr> hr> doc/ hr> release/[0-9]+.[0-9]+.[0-9]+ hr> user/ hr> projects/ hr> svnadmin/ hr> hr> 2. Migration Plan hr> hr> 2-1) Freeze the current CVS repository on Saturday, April 7 (after hr> 8.3R release date). No more commit to the CVS repository after hr> this freeze. Populate the converted SVN repository, and commit hr> necessary changes for repository administration, build hr> infrastructure for www.FreeBSD.org, and etc. just after that. hr> hr> 2-2) Apply www/<lang> -> doc/<lang>/htdocs change and commit hr> necessary changes for the www build. This is basically a hr> directory renaming and merge of duplicate parts in www/share and hr> doc/share. This will be done just after 2-1). hr> hr> 2-3) Open the converted repository for doc committers within that day hr> if there is no major problem. hr> hr> Notes: hr> hr> a) No automatic SVN->CVS import after the conversion like the src hr> repository. This is because it is not reliable and deprecating hr> CVS support of the doc and www repository should have a limited hr> impact for most of people. hr> hr> b) We will have to see how well the migration goes for a while after hr> the conversion date. I think 2 or 3 weeks are enough. More hr> specifically, for that period, normal commits to the doc/ hr> directory are allowed but sweeping changes or using user/ and hr> projects/ are not allowed. After such a period, let us use user/ hr> and projects/ for large projects like Handbook reorganization and hr> SGML->XML conversion. hr> ---- hr> hr> -- Hiroki ----Security_Multipart(Sat_May__5_07_34_32_2012_559)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAk+kWXgACgkQTyzT2CeTzy3y7gCeMDU7AarRMSzwpVSp4RWXVRqH z5YAn1kxHLzcFlzHpIn/iMH3umyAkxs9 =tM2x -----END PGP SIGNATURE----- ----Security_Multipart(Sat_May__5_07_34_32_2012_559)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120505.073432.1340981733888578154.hrs>