svn commit: r418289 - /lenya/docu/src/documentation/content/xdocs/guidelines.xml

[gr...@apache.org]

Author: gregor
Date: Fri Jun 30 07:07:06 2006
New Revision: 418289

URL: http://svn.apache.org/viewvc?rev=418289&view=rev
Log:
add sandbox and branch policies

Modified:
    lenya/docu/src/documentation/content/xdocs/guidelines.xml

Modified: lenya/docu/src/documentation/content/xdocs/guidelines.xml
URL: http://svn.apache.org/viewvc/lenya/docu/src/documentation/content/xdocs/guidelines.xml?rev=418289&r1=418288&r2=418289&view=diff
==============================================================================
--- lenya/docu/src/documentation/content/xdocs/guidelines.xml (original)
+++ lenya/docu/src/documentation/content/xdocs/guidelines.xml Fri Jun 30 07:07:06 2006
@@ -605,6 +605,15 @@
   <section id="code">
     <title>Code management</title>
 
+    <p>Development on the Lenya codebase happens on the trunk, unless a vote to create a branch 
+       has passed. Experimental code not immediately intended for merging into trunk may 
+       be commited to the sandbox. In order to prevent a code graveyard, sandbox contents will 
+       be reviewed every 6 months and either merged into trunk, promoted to their own top-level directory, 
+       or deleted. At any one time, the Lenya project maintains one release branch. At appropriate 
+       times, the Lenya project may cut a new release branch from trunk, and retire the previous one. 
+       Old release branches are kept in SVN, but are clearly marked as unmaintained both in SVN and on the web site.
+    </p>
+
     <p>
       The term "patch" has two meanings: Developers provide a set of changes
       via our <link href="site:community/index_com">issue tracker</link> marked for inclusion,



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org