You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by pg...@apache.org on 2006/11/20 03:03:54 UTC

svn commit: r477006 - /httpd/apreq/branches/v2_09/build/RELEASE

Author: pgollucci
Date: Sun Nov 19 18:03:52 2006
New Revision: 477006

URL: http://svn.apache.org/viewvc?view=rev&rev=477006
Log:
merge r477005

Modified:
    httpd/apreq/branches/v2_09/build/RELEASE

Modified: httpd/apreq/branches/v2_09/build/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_09/build/RELEASE?view=diff&rev=477006&r1=477005&r2=477006
==============================================================================
--- httpd/apreq/branches/v2_09/build/RELEASE (original)
+++ httpd/apreq/branches/v2_09/build/RELEASE Sun Nov 19 18:03:52 2006
@@ -30,19 +30,13 @@
 
        % svn commit -m "2.09 release started" STATUS CHANGES include/apreq_version.h
 
-    NOTE the revision that you committed.
-    Call it $rS.
-
-    If you make any ADDITIONAL  changes to this branch you'll need to merge them back to the trunk
-    Either now, or when the release cycle is complete (See step 15)
-
 3. On TRUNK:
     Update CHANGES and STATUS to reflect the start of a new develoment cycle,
     and run this to update the package version numbers throughout the tree:
 
     % build/update_version.pl 2.10
 
-    % svn commit -m "2.10 cycle" STATUS CHANGES include/apreq_version.h
+    % svn commit -m "2.10 cycle"
 
 4. Prep the package for CPAN by running:
 
@@ -73,6 +67,7 @@
    announcement to the modperl@ list, to solicit feedback
    from a much larger audience.
 
+   Subject: [RELEASE CANDIDATE] libapreq2 2.10 RC\d+
 
 8. Give the mailing list participants 48-72 hours to comment and
    vote on the candidate.  If there is a "majority consensus" 
@@ -82,17 +77,14 @@
 
 9. Tag the Release -- from the BRANCH
 
-    svn cp https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09 \
+    svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09 \
            https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_09
 
-    NOTE the Revision that is copied.  Call it $rE.
-    It will be in the commit e-mail.
-
 10. Upload (scp) the package and signature to www.apache.org
    for distribution:
 
         % scp libapreq2-2.09.tar.gz* \
-          <username>@people.apache.org:/www/www.apache.org/dist/httpd/libapreq/
+          $USER@people.apache.org:/www/www.apache.org/dist/httpd/libapreq/
 
    Ask another developer to confirm the uploaded signature is ok.
 
@@ -123,24 +115,5 @@
 
     % build/announcement.pl $USER@apache.org < CPAN_ack | ssh $USER@people.apache.org "sendmail -oi -t -odq"
 
-15. Once you are SURE, you've merged any ADDITIONAL changes on the BRANCH back to TRUNK,
-    delete the branch:
-
-    [NOTE, $rS and $rE are the values you noted above]
-
-    % svn help merge | head -4
-      merge: Apply the differences between two sources to a working copy path.
-      usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
-             2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
-             3. merge -r N:M SOURCE[@REV] [WCPATH]
-
-    svn co https://svn.apache.org/repos/asf/httpd/apreq/trunk 
-    cd trunk
-
-    svn merge https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09@$rS \
-              https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09@$rE
-  
-    svn del https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09
-
-16. Drink Beer!
+15. Drink Beer!