svn commit: samba-web r1165 - in trunk/devel: .

Sun Dec 23 18:14:18 GMT 2007

Author: idra
Date: 2007-12-23 18:14:18 +0000 (Sun, 23 Dec 2007)
New Revision: 1165

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1165

Log:
Update information about development now that we fully use Git for 3.0.x/3.2.x

Modified:
   trunk/devel/index.html


Changeset:
Modified: trunk/devel/index.html
===================================================================

--- trunk/devel/index.html	2007-12-20 00:26:05 UTC (rev 1164)
+++ trunk/devel/index.html	2007-12-23 18:14:18 UTC (rev 1165)
@@ -12,7 +12,14 @@
 
 <h3>General Overview</h3>
 
-<p>As of 4 April 2004, the Samba Team converted from CVS to Subversion for maintaining the Samba source code.  All current development is done in a Subversion repository.  All older code is in the original CVS tree; this would include 2.2.x versions of Samba, which are no longer in active development.</p>
+<p>On 4 April 2004, the Samba Team converted from CVS to Subversion for
+maintaining the Samba source code, and we are now (fall 2007) switching to
+Git. The 3.0.x and 3.2.x branches have been already migrated fully to Git and
+Git is the authoritative repository for them. Samba4 will follow shortly.
+With the transition to Git we also recovered in the main tree the CVS history.
+All older code is in the original Subversion and CVS trees; this would include
+3.0.x and 2.2.x versions of Samba, which are no longer in active development.
+</p>
 
 <p>The latest production release is <em>Samba 3.0.28</em> (<a
 href="/samba/history/samba-3.0.28.html">release notes</a> and <a
@@ -27,47 +34,52 @@
 
 <p>Ongoing future research is being done for Samba 4.0
 This work is concurrent with Samba 3.2 maintenance 
-and development.  A <a href="/samba/ftp/samba4/">technology 
-preview release</a> is available.</p>
+and development.  An <a href="/samba/ftp/samba4/">alpha release</a> is available.</p>
 
-<p>In addition to the Subversion references also see Jerry's wiki article on
-<a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Using
-Git for Samba Development</a>.</p>
-
 <br />
 <h3>Samba Branches</h3>
 
-<p>Areas of Samba development are listed below according to their branches within the Subversion source tree.  Plans for each release follow its listing, along with a sample check out command.</p>
+<p>Areas of Samba development are listed below according to their branches within the Git and Subversion source tree.  Plans for each release follow its listing, along with a sample check out command.</p>
 
-  <ul>
-    <li><h4><em>TRUNK</em></h4>
-    <p><b>NOTE:</b> TRUNK is no longer used for development.  See the news item
-	<a href="http://news.samba.org/developers/svn_repo_reorganized/">SVN Repo 
-	Reorganzied</a> for more info.</p>
-  </ul>
+<h3>GIT</h3>
 
-  <ul>
-    <li><h4><em>SAMBA_3_2</em></h4>
-    <p>This is the current development branch for 3.2.x production releases.</p>
-    <p>Example checkout command:</p></li>
-  </ul>
-
+<p>Example checkout command for the main git repo:<br>
+</p>
 <pre>
-svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_2 samba3
+git-clone git://git.samba.org/samba.git samba
 </pre>
+<p>See Jerry's wiki article on
+<a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Using
+Git for Samba Development</a>.</p>
 
+<p>List of branches:</p>
+
   <ul>
-  	<li><h4>SAMBA_3_2_X</h4>
-	<p>Before a release, a SAMBA_3_2_X branch is created, where X is the latest
-	release number (SAMBA_3_2_0, for example). This branch is used by
-	developers to check in stuff they want to see in the 3.2.x release.</p>
-	<p>Example checkout command (remember to substitute for current release):</p>
-	</li>
+    <li>
+      <h4><em>v3-2-test</em></h4>
+      <p>This is the current development branch for 3.2.x development.</p>
+    </li>
+    <li>
+      <h4><em>v3-2-stable</em></h4>
+      <p>This is the current development branch for 3.2.x production releases.</p>
+    </li>
+    <li>
+      <h4><em>v3-0-test</em></h4>
+      <p>This is the current development branch for 3.0.x development.
+         (critical bugfix and security fixes <em>only</em>)</p>
+    </li>
+    <li>
+      <h4><em>v3-0-stable</em></h4>
+      <p>This is the current development branch for 3.0.x production releases.</p>
+    </li>
   </ul>
 
+<h3>Subversion</h3>
+
+<p>Example checkout command:</p>
 <pre>
-svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_2_0 samba_3.2.0
-</pre> 
+svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0 samba4
+</pre>
 
   <ul>
     <li><h4><em>SAMBA_4_0</em></h4>
@@ -76,13 +88,14 @@
        for download.  Be aware that these snapshots are intended for testing purposes 
        only and not for use in production environments.  For more information, see 
        the <a href="/samba/devel/roadmap-4.0.html">road map document</a>.</p>
-    <p>Example checkout command:</p></li>
+    </li>
+
+    <li><h4><em>Subversion TRUNK</em></h4>
+    <p><b>NOTE:</b> TRUNK is not use for development. See the news item
+	<a href="http://news.samba.org/developers/svn_repo_reorganized/">SVN Repo 
+	Reorganzied</a> for more info.</p>
   </ul>
 
-<pre>
-svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0 samba4
-</pre>
-
 <p>Further information on anonymous subversion access is available on <a href="/samba/subversion.html">the subversion page</a>.  Those interested in the old CVS tree can check out the the <a href="/samba/cvs.html">CVS page</a>.</p>
 
 <br />

