r2468 - website

[Julian Mehnle]

Author: jmehnle-guest
Date: 2006-03-21 13:24:04 +0000 (Tue, 21 Mar 2006)
New Revision: 2468

Modified:
   website/subversion.pod
Log:
website/subversion.pod
* Broke section 5, "Tagging and Releasing", down into...
  5.1 Automatic tagging using svn-buildpackage
  5.2 Manual tagging
  5.3 Working with tags
  ...and explained in section 5.1 explicitly how to use `svn-buildpackage` to
  create tags, including the "--svn-tag-only" form for post-build tagging.


Modified: website/subversion.pod
===================================================================
--- website/subversion.pod	2006-03-21 13:21:08 UTC (rev 2467)
+++ website/subversion.pod	2006-03-21 13:24:04 UTC (rev 2468)
@@ -158,7 +158,7 @@
 
 =head1 4. Building the package
 
-=head2 4.1 Building trunk
+=head2 4.1 Building the trunk
 
 If we wanted to check out a release for building, we would carry out the
 following command:
@@ -237,17 +237,24 @@
 filesystem.  SVN does this cleverly, so you can keep track of log entries and
 the tag copy doesn't take up any extra space on disk.
 
-Note that using our usual workflow, the tags will be created by
+=head2 5.1 Automatic tagging using svn-buildpackage
 
-    svn-buildpackage --svn-tag
+You can create the tag automatically when building the final version of the
+package that is going to be uploaded to the archive by using svn-buildpackage's
+C<--svn-tag> option:
 
-when building the final version of the package that is going to be uploaded to
-the archive.  The only exception might be the initial upload of a package with
-a version already in the archive (though it is arguable if we actually need
-this version as a tag).
+    svn-buildpackage [...] --svn-tag
 
-Anyway, it works like this:
+If you have already built and/or uploaded the final version, you can use
+svn-buildpackage's C<--svn-tag-only> option to create the tag only and not do
+any package building:
 
+    svn-buildpackage --svn-tag --svn-tag-only
+
+=head2 5.2 Manual tagging
+
+In case you need or want to create a tag manually, it works like this:
+
     svn copy \
         svn+ssh://user@svn.debian.org/svn/pkg-perl/packages/libfile-touch-perl/trunk/ \
         svn+ssh://user@svn.debian.org/svn/pkg-perl/packages/libfile-touch-perl/tags/0.04-1
@@ -255,6 +262,14 @@
 You don't need a check-out of the SVN tree to do this.  It even works faster if
 you don't have one.  It can execute these commands over the network.
 
+You can tag an older revision by using the C<-r> switch:
+
+    svn copy -r 53 \
+        svn+ssh://user@svn.debian.org/svn/pkg-perl/packages/libfile-touch-perl/trunk/ \
+        svn+ssh://user@svn.debian.org/svn/pkg-perl/packages/libfile-touch-perl/tags/tag_we_forgot
+
+=head2 5.3 Working with tags
+
 Whenever you would feel like checking out one Debian release, just check out
 the directory you copied earlier.
 
@@ -267,12 +282,6 @@
 B<NB!>  Never modify files in the tag directory.  If you tag by mistake, just
 delete the directory and copy a different revision of the trunk.
 
-You can tag an older revision by using the C<-r> switch:
-
-    svn copy -r 53 \
-        svn+ssh://user@svn.debian.org/svn/pkg-perl/packages/libfile-touch-perl/trunk/ \
-        svn+ssh://user@svn.debian.org/svn/pkg-perl/packages/libfile-touch-perl/tags/tag_we_forgot
-
 =head1 6. Upstream upgrade
 
 When a new version of a package has been released upstream, the SVN repository