From e10bac4061416741bd4179709c4904434c2f7390 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Tue, 11 Mar 2003 14:13:37 +0000 Subject: [PATCH] procedure fixes (Martin Wille) plus FAQ entry [SVN r17814] --- more/release_procedures.htm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/more/release_procedures.htm b/more/release_procedures.htm index f5e6110f69..fb050e8faa 100644 --- a/more/release_procedures.htm +++ b/more/release_procedures.htm @@ -28,6 +28,7 @@ Procedure Overview
Procedures for Developers
Procedures for the Release Manager
+FAQ
Acknowledgements

Introduction

Each release of Boost software is overseen by a release manager, who @@ -74,7 +75,8 @@ logs, and committing fixes to CVS.

  • If specific to the release candidate only, the fixes should be committed directly to the release candidate branch. In the more common case of fixes which apply to both the main trunk and the release branch, the fixes are best - made to the main trunk, and then merged into the release candidate branch.
    + made to the main trunk, and then merged into the release candidate branch. See + FAQ for tag rationale.

    After a fix has been committed to the main trunk, here is a typical procedure (assuming the release candidate branch is named RC_1_26_2) @@ -87,7 +89,7 @@ logs, and committing fixes to CVS.

    [After fixed code is committed to main branch]
 cvs update -r RC_1_26_2 [switch to the release candidate branch]
-cvs update -jmerged_to_1_26_2 -jHEAD buggycode.hpp [merge changes from the trunk to the branch]
+cvs update -jmerged_to_RC_1_26_2 -jHEAD buggycode.hpp [merge changes from trunk to branch]
  --> RCS file: /cvsroot/boost/.../buggycode.hpp,v
  -->    retrieving revision 1.4
  -->    retrieving revision 1.6
@@ -115,7 +117,8 @@ cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp [tag new merged point]
       
    Merge changes from main trunk into the release candidate branch:
    
     
    
       
    Modify | Update selection... | 
-    Update settings | Merge options | Only this rev/tag: merged_to_1_26_2 
+    Update settings | Merge options | Only this rev/tag: 
+      merged_to_RC_1_26_2 
       | Plus with this rev/tag: HEAD | OK
    
     
    
       
    Commit merge results:
    
@@ -141,13 +144,21 @@ cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp [tag new merged point]
   
  • Tag the main trunk  merged_to_RC_n_n_n.
    • 
   
  • Branch the main trunk with the tag RC_n_n_n.
    • 
 
+
    FAQ
    
+
    What is the purpose of the 
+merged_to_RC_n_n_n tag? This tag allows multiple merges from the 
+main trunk to the release candidate branch. Without it, merging an initial main 
+trunk fix  into the release candidate branch would work, but merging a 
+second fix from main trunk to release candidate branch would result in a merge 
+conflict. Although this procedure seems convoluted, it works much better in 
+practice than several prior procedures we tried.
    
 
    Acknowledgements
    
 
    This web page was written by Beman Dawes, with helpful suggestions from Dave 
 Abrahams and Steve Robbins. Jim Hyslop contributed the original CVS procedures. 
 Updated by Jeff Garland after 1.29 release based on list discussions.
    
 
    
 
    Revised:
-06 March, 2003
    
+11 March, 2003