[Pkg-samba-maint] r1677 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-12-13 09:44:43 +0000 (Thu, 13 Dec 2007)
New Revision: 1677

Added:
   trunk/samba/debian/README.source
Log:
add documentation on merging new upstream versions



Added: trunk/samba/debian/README.source
===================================================================
--- trunk/samba/debian/README.source	                        (rev 0)
+++ trunk/samba/debian/README.source	2007-12-13 09:44:43 UTC (rev 1677)
@@ -0,0 +1,24 @@
+Merging upstream releases
+=========================
+
+$ svn-load -t tags/samba/upstream_${version} \
+svn+ssh://svn.debian.org/svn/pkg-samba branches/samba/upstream .
+
+The svn-load command is in the aptly-named "svn-load" package.  The 
+above is the simplest use of svn-load to merge a new upstream version
+into the "upstream" branch and copy it to a per-version tag directory;
+please see "svn-load --help" for a list of other options that are of
+interest.  In particular, you may find that the --wc option saves time
+if you're on a slow connection, and the "-m" option may be needed if
+files are moved around in the upstream repository and this needs to be
+indicated to prevent subversion treating this as addition and deletion
+of unrelated files.
+
+Note that this only imports the new upstream version into the branch, it
+doesn't merge it onto the trunk.  For this, you should go to your
+(clean) working copy of the trunk and run:
+
+$ svn merge \
+svn+ssh://svn.debian.org/svn/pkg-samba/tags/samba/upstream_{prev_version,new_version}
+$ svn diff # (to make sure the diff makes sense)
+$ svn commit -m "merge upstream $version"