HEADS UP: CVS->SVN repository conversion
Locked
 
|
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/<lang>" to "doc/<lang>/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/<lang> -> doc/<lang>/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 |
attachment0 (203 bytes)
|
|
In reply to this post by Hiroki Sato
One quick question:
On Mon, Mar 05, 2012 at 02:41:13AM +0900, Hiroki Sato wrote: [...] > 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: > [...] > So, the final layout will be the following: > > doc/ > release/[0-9]+.[0-9]+.[0-9]+ > user/ > projects/ > svnadmin/ > What will happen as far as relnotes build, with regards to the www/<lang>/ -> doc/<lang>/htdocs/ move? Currently, the release notes part of the build is pulled in from src/release/doc/ - will that change, and become part of the doc/ tree in svn? Glen PS: My personal thanks for getting us moved away from CVS. |
|
|
In reply to this post by René Ladan
Rene Ladan <[hidden email]> wrote
in <[hidden email]>: 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 |
|
|
In reply to this post by Glen Barber-6
Glen Barber <[hidden email]> wrote
in <[hidden email]>: gj> One quick question: gj> gj> On Mon, Mar 05, 2012 at 02:41:13AM +0900, Hiroki Sato wrote: gj> gj> [...] gj> gj> > 1. Repository Layout gj> > gj> > You can checkout the converted repository by using: gj> > gj> > % svn co http://docsvn.allbsd.org/base gj> > gj> > The repository layout in the URL is the following: gj> > gj> gj> [...] gj> gj> > So, the final layout will be the following: gj> > gj> > doc/ gj> > release/[0-9]+.[0-9]+.[0-9]+ gj> > user/ gj> > projects/ gj> > svnadmin/ gj> > gj> gj> What will happen as far as relnotes build, with regards to the gj> www/<lang>/ -> doc/<lang>/htdocs/ move? Currently, the release notes gj> part of the build is pulled in from src/release/doc/ - will that change, gj> and become part of the doc/ tree in svn? I have no specific idea/plan about that though it should be improved in any way. Let's discuss it after the conversion. -- Hiroki |
|
|
|
Li-Wen Hsu <[hidden email]> wrote
in <[hidden email]>: lw> On Mon, Mar 5, 2012 at 10:51, Hiroki Sato <[hidden email]> wrote: lw> > Glen Barber <[hidden email]> wrote lw> > in <[hidden email]>: lw> > lw> > gj> One quick question: lw> > gj> lw> > gj> On Mon, Mar 05, 2012 at 02:41:13AM +0900, Hiroki Sato wrote: lw> > gj> lw> > gj> What will happen as far as relnotes build, with regards to the lw> > gj> www/<lang>/ -> doc/<lang>/htdocs/ move? Currently, the release notes lw> > gj> part of the build is pulled in from src/release/doc/ - will that change, lw> > gj> and become part of the doc/ tree in svn? lw> > lw> > I have no specific idea/plan about that though it should be improved lw> > in any way. Let's discuss it after the conversion. lw> > lw> lw> Just be curious, what is the purpose of www/<lang>/ -> doc/<lang>/htdocs/ move? lw> Won't that make website building more complex? Or it does benefit the process? It is to make the build process less complex actually. Currently the www and doc trees have own build infrastructure but most of the parts are duplicated. Also, this fact makes reuse of information in doc/share and www/share such as the mirror site list unnecessarily complex. The www/<lang> -> doc/<lang>/htdocs change will clear up the duplicated information and Makefiles. The build results will not change basically. -- Hiroki |
|
|
|
|
In reply to this post by Hiroki Sato
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 <[hidden email]> wrote in <[hidden email]>: 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 |
Loading...
| Powered by Nabble | Edit this page |