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 02:57:27 UTC
svn commit: r477005 - /httpd/apreq/trunk/build/RELEASE
Author: pgollucci
Date: Sun Nov 19 17:57:26 2006
New Revision: 477005
URL: http://svn.apache.org/viewvc?view=rev&rev=477005
Log:
Simply this. Assume that nothing is committed directly to the release branches
expect the undefing of dev symbols. This is more inline with httpd process
where everything starts in trunk is merged to appropriate branches. This means
we only mergeon e direction.
Note, perl will take this approach as well in the very near future.
Modified:
httpd/apreq/trunk/build/RELEASE
Modified: httpd/apreq/trunk/build/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/RELEASE?view=diff&rev=477005&r1=477004&r2=477005
==============================================================================
--- httpd/apreq/trunk/build/RELEASE (original)
+++ httpd/apreq/trunk/build/RELEASE Sun Nov 19 17:57:26 2006
@@ -30,12 +30,6 @@
% 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:
@@ -83,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.
@@ -124,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!