[PATCH] Move from SVN to Git

Andrew Kroeger andrew at sprocks.gotdns.com
Fri Feb 8 13:47:04 GMT 2008


All:

Please find attached my proposed patch to help clarify the move from SVN
to Git for the Samba development repositories.

Although I have not been through the entire Samba website, I have tried
to follow and address most cases related to development.  The changes I
propose should help future people find the correct source base for the
samba they are looking for.

Sincerely,
Andrew Kroeger
-------------- next part --------------
Index: trunk/team/index.html
===================================================================
--- trunk/team/index.html	(revision 1170)
+++ trunk/team/index.html	(working copy)
@@ -6,8 +6,8 @@
 
 <p>The Samba Team is a loose-knit group of about 30 people from all over the
 world who contribute regularly to Samba and have direct write access to the <a
-href="/samba/subversion.html">Samba subversion tree</a>.  The number of people
-actively doing subversion checkins is approximately 10 - 12 people.  Of course,
+href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Samba Git repository</a>.  The number of people
+actively doing Git checkins is approximately 10 - 12 people.  Of course,
 there is <a href="http://projects.samba.org/">always room to help</a>.</p>
 
 <p>Here is a new photo of some of us at this year's CIFS conference:</p>
Index: trunk/docs/FAQ/index.html
===================================================================
--- trunk/docs/FAQ/index.html	(revision 1170)
+++ trunk/docs/FAQ/index.html	(working copy)
@@ -66,10 +66,10 @@
 
 <p>Samba4 is a development branch that hasn't yet had an initial release.  If 
 you are a developer wanting to play with the bleeding-edge of the work done on 
-Samba, try <a href="http://websvn.samba.org/cgi-bin/viewcvs.cgi/branches/SAMBA_4_0/">Samba4</a>, 
+Samba, try <a href="http://gitweb.samba.org/?p=samba.git;a=tree;h=v4-0-test;hb=v4-0-test">Samba4</a>, 
 which you'll obviously have to build yourself.  You can also try 
-<a href="http://websvn.samba.org/cgi-bin/viewcvs.cgi/trunk/">Trunk</a> in the 
-Subversion source tree, if you want to experiment with upcoming 3.0.x 
+<a href="http://gitweb.samba.org/?p=samba.git;a=tree;h=v3-2-test;hb=v3-2-test">Samba 3.2</a> in the 
+Git source tree, if you want to experiment with upcoming 3.2.x 
 features.</p>
 
 <p>The current stable, production Samba server is the Samba 3.0 branch.  The
Index: trunk/header_columns.html
===================================================================
--- trunk/header_columns.html	(revision 1170)
+++ trunk/header_columns.html	(working copy)
@@ -109,7 +109,8 @@
   <img src="/samba/images/hack.png" alt="hack samba" />
   <ul>
   <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
+  <li><a href="http://gitweb.samba.org">Git Source</a></li>
+  <li><a href="http://websvn.samba.org">Historical SVN Source</a></li>
   <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
   <li><a href="http://build.samba.org/">Build Farm</a></li>
   <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
Index: trunk/devel/TODO.html
===================================================================
--- trunk/devel/TODO.html	(revision 1170)
+++ trunk/devel/TODO.html	(working copy)
@@ -21,7 +21,7 @@
 
 <h3>Testing</h3>
 
-<p>Samba 3.0 is currently under development (see the <a href="/samba/devel/">development page</a> for more detail on Samba SVN branches).  The more testing that is done, the better the release will be.  Everyone counts.  Be aware that this is pre-release development code made available for testing purposes only (i.e. non-production systems).</p>
+<p>Samba 3.0 is currently under development (see the <a href="/samba/devel/">development page</a> for more detail on Samba Git branches).  The more testing that is done, the better the release will be.  Everyone counts.  Be aware that this is pre-release development code made available for testing purposes only (i.e. non-production systems).</p>
 <br />
 
 
@@ -29,11 +29,11 @@
 
 <p>All coding work needs to be coordinated with a <a href="/samba/team/">Samba Team member</a>, at the very least, on the <a href="http://lists.samba.org/listinfo/samba-technical">samba-technical mailing list</a> or on the #samba-technical IRC channel (irc.freenode.net).  Don't just start coding and expect patches to automatically be integrated in.  Obviously, projects by specific team members -- winbind, for example -- need to be coordinated with those team members in charge.</p>
 
-<p>For those without CVS write access (non-team members), patches should be incremental and in the form of context diffs (attached diff -u output).</p>
+<p>For those without Git write access (non-team members), patches should be incremental and in the form of context diffs (attached diff -u output).</p>
 
-<p>If you want to code, you should know how to get the source branches via anonymous SVN.  See our <a href="/samba/subversion.html">Subversion instructions</a> for details.</p>
+<p>If you want to code, you should know how to get the source branches via anonymous Git.  See our <a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Git instructions</a> for details.</p>
 
-<p>Anyone interested in actively participating in Samba development probably should also subscribe to the <a href="http://lists.samba.org/listinfo/samba-cvs">samba-cvs mailing list</a> in order to follow SVN commit log messages.</p>
+<p>Anyone interested in actively participating in Samba development probably should also subscribe to the <a href="http://lists.samba.org/listinfo/samba-cvs">samba-cvs mailing list</a> in order to follow Git commit log messages.</p>
 
   <ul>
     <li>(Priority - MEDIUM, Status - ACTIVE) Implement ACL support for currently unsupported platforms.</li>
Index: trunk/subversion.html
===================================================================
--- trunk/subversion.html	(revision 1170)
+++ trunk/subversion.html	(working copy)
@@ -4,8 +4,14 @@
 
 <h2>Subversion access to svnanon.samba.org</h2>
 
-<h3>Overview</h3>
+<H1>samba development changed to git</H1>
 
+In January 2008 Samba development changed from using Subversion to Git for
+version control. Please see the <a href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">
+Using Git for Samba Development</a> for details.
+
+<h2>Overview</h2>
+
 <p>svnanon.samba.org contains an anonymous Subversion repository. The source 
 code in this repository is synchronised from the main branch every 5 minutes.</p>
 
Index: trunk/header_wide.html
===================================================================
--- trunk/header_wide.html	(revision 1170)
+++ trunk/header_wide.html	(working copy)
@@ -107,7 +107,8 @@
   <img src="/samba/images/hack.png" alt="hack samba" />
   <ul>
   <li><a href="/samba/devel/">Devel Overview</a></li>
-  <li><a href="http://websvn.samba.org">SVN Source</a></li>
+  <li><a href="http://gitweb.samba.org">Git Source</a></li>
+  <li><a href="http://websvn.samba.org">Historical SVN Source</a></li>
   <li><a href="http://cvs.samba.org/cgi-bin/cvsweb/">Historical CVS Source</a></li>
   <li><a href="http://build.samba.org/">Build Farm</a></li>
   <li><a href="https://bugzilla.samba.org">Bug Reports</a></li>
Index: trunk/download/index.html
===================================================================
--- trunk/download/index.html	(revision 1170)
+++ trunk/download/index.html	(working copy)
@@ -47,17 +47,18 @@
     <td>
     </td>
     <td>
-	<h3 align="center">Subversion and CVS Sources</h3>
+	<h3 align="center">Git, Subversion and CVS Sources</h3>
           You can also fetch the sources using a source code control
           system.  The advantage of fetching via a version control system 
           that you can update your
 	  sources at any time using a single command.  See the <a 
-	  href="/samba/subversion.html">Subversion instructions</a> and <a 
+	  href="http://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Git instructions</a>, <a 
+	  href="/samba/subversion.html">Subversion instructions (historical)</a> and <a 
           href="/samba/cvs.html">CVS instructions (historical)</a> for information on 
-	  fetching the sources one of these tools.  Please be aware that the CVS 
+	  fetching the sources one of these tools.  Please be aware that the CVS and SVN
           repositories are being maintained as archives only, and are not being 
-          updated.  Active development is only taking place within the subtree 
-          trees.
+          updated.  Active development is only taking place within the Git
+	  repository. 
     </td>
   </tr>
   <tr valign="top">


More information about the samba-technical mailing list