[Cocoon Wiki] Updated: SubversionMigration

[do...@cocoon.apache.org]

   Date: 2004-08-18T08:14:01
   Editor: VadimGritsenko <vg...@apache.org>
   Wiki: Cocoon Wiki
   Page: SubversionMigration
   URL: http://wiki.apache.org/cocoon/SubversionMigration

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -1,20 +1,29 @@
-=  Moving to Subversion =
+= Moved to Subversion =
 
-The move to Subversion (instead of CVS) for our code repositories is [http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=108262246311464&w=2 planned] for after the 2.1.5 release.
+Cocoon CVS repositories are moved into the [http://svn.apache.org/repos/asf/ Apache Subversion Repository]. This page is meant to collect information about this move, and help people configure their SVN clients.
 
-This page is meant to collect information about this move, and help people configure their SVN clients.
+== Repository Details ==
+
+There were two active CVS respositories, '''cocoon-2.1''' and '''cocoon-2.2'''. Former had two branches, '''BRANCH_2_1_X''' and '''HEAD'''. Latter has only '''HEAD'''.
+
+cocoon-2.1's '''BRANCH_2_1_X''' was started out of '''RELEASE_2_1_5''' tag, and has one release, tagged as '''RELEASE_2_1_5_1'''. cocoon-2.1's '''HEAD''' contains code of cocoon-2.2-dev, next minor version of Cocoon.
+
+cocoon-2.2's '''HEAD''', despite its name, actually contains experimental code for the new Cocoon kernel which might grow into the foundation of Cocoon's "real blocks".
+
+When CVS repositories were migrated into the Subversion, naming confusion was resolved, by clearly marking what is where. Thus,
+ * cocoon-2.1 '''HEAD''' became trunk, and contains 2.2-dev,
+ * cocoon-2.1 '''BRANCH_2_1_X''' is branch with same name and contains 2.1.6-dev,
+ * cocoon-2.2 '''HEAD''' became '''new-kernel''' branch and contains experimental code.
 
 ==  Practice SVN repository ==
-The practice repository found at {{{http://svn.apache.org/repos/test}}} can be used to test your SVN client. This URL is read-only.
+The practice repository found at {{{http://svn.apache.org/repos/test/}}} can be used to test your SVN client. This URL is read-only.
 
-For committers, a writable test repository is available at {{{https://svn.apache.org/repos/test}}}.
-To generate a password, ssh to minotaur.apache.org and run the following command:
+For committers, a writable test repository is available at {{{https://svn.apache.org/repos/test/}}}. To generate a password, ssh to minotaur.apache.org and run the following command:
 
 {{{
 svnpasswd username
 }}}
 
-
 This will ask you for a subversion password. This is the user and password
 you can use when checking in code.
 
@@ -32,7 +41,7 @@
  *  [http://rapidsvn.tigris.org/ RapidSVN] (Win32, Linux)
  *  [http://jsvn.alternatecomputing.com/ JSVN] (Java)
 
-==  Quirks with some clients ==
+== Quirks with some clients ==
 
 ===  Use recent version of Subclipse ===
 The latest versions of Subclipse are hidden in the depth of the menus at their website. At [http://subclipse.tigris.org/servlets/ProjectDocumentList?folderID=2240] find the latest builds.