diff --git a/index.htm b/index.htm index af1b4b7..6fb7e27 100644 --- a/index.htm +++ b/index.htm @@ -66,6 +66,8 @@ content="text/html; charset=iso-8859-1"> which compiler.

Formal Review Schedule  Future, current, and recently past Formal Reviews.

+

Release Procedures  How + developers and the release manager prepare for a Boost release.

Internal Regression Test Suite   Describes the tool for generating the compiler status tables

@@ -130,6 +132,6 @@ content="text/html; charset=iso-8859-1">

Revised 18 January, 2002

+s-format="%d %B, %Y" startspan -->28 January, 2002

\ No newline at end of file diff --git a/release_procedures.htm b/release_procedures.htm new file mode 100644 index 0000000..4e86465 --- /dev/null +++ b/release_procedures.htm @@ -0,0 +1,169 @@ + + + + + + + +Release Procedures + + + + + + + + + + + + + +
+ c++boost.gif (8819 bytes)HomeLibrariesPeopleFAQMore
+ + +

Boost Release Procedures

+

Introduction
+Procedure Overview
+Procedures for Developers
+Procedures for the Release Manager
+Acknowledgements

+

Introduction

+

Each release of Boost software is overseen by a release manager, who +coordinates release activities via the Boost mailing list, as well as performing +the detailed procedures for the release.

+

Boost developers assist the release manager by reviewing regression test +logs, and committing fixes to CVS.

+

Release Procedure Overview

+ +

Release Procedures for Developers

+ +
+ +
+ 
cvs update -r RC_1_26_2 [switch to the branch]
+[modify buggycode.hpp]
+cvs commit buggycode.hpp
+[repeat modify/commit as desired]
+
+[when ready for first merge]
+cvs update -A [switch to the trunk]
+cvs update -j RC_1_26_2 buggycode.hpp [merge changes to the trunk]
+[resolve any conflicts, make sure it builds, etc. etc.]
+cvs commit -m "Merged from branch to trunk" buggycode.hpp
+cvs update -r RC_1_26_2 buggycode.hpp [switch back to the branch]
+cvs tag RC_1_26_2_last_merge buggycode.hpp [keep track of the last merge
+point]
+[merge is complete]
+
+[modify buggycode.hpp]
+cvs commit buggycode.hpp
+[repeat modify/commit as desired]
+
+[when ready for second and subsequent merges]
+cvs update -A
+cvs update -j RC_1_26_2_last_merge -j RC_1_26_2 buggycode.hpp
+[resolve any conflicts, make sure it builds, etc. etc.]
+cvs commit -m "Second merge from branch to trunk" buggycode.hpp
+cvs update -r RC_1_26_2 buggycode.hpp
+cvs tag -F RC_1_26_2_last_merge buggycode.hpp [-F forces the tag to move; or
+create a new tag]
+[merge is complete]
+
+
+ +
+

Switch to branch: Select file(s), then Modify | Update selection... | + Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK
+
+ Edit files needing fixes.
+
+ Commit changes: Modify | Commit... | Enter log message: ... | OK
+
+ Switch back to main trunk: Modify | Update selection... | Update settings | + Reset any sticky date/tag/-k options. | OK
+
+ If changes should also be merged into main trunk:

+
+

Merge changes from release candidate to main trunk: Modify | Update + selection... | Merge options | Only the rev/tag: RC_!_26_2 | OK
+
+ Commit merge results: Modify | Commit... | Enter log message: ... | OK

+
+

Note that if a second or subsequent merge is required:

+
+

Switch to branch: Select file(s), then Modify | Update selection... | + Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK

+

Tag to keep track of last merge point: Modify | Create tag on + selection... | Enter tag name: RC_1_26_2_last_merge | Overwrite existing + tags with same name | OK

+

Edit files needing fixes.

+

Commit changes: Modify | Commit... | Enter log message: ... | OK

+

Switch back to main trunk: Modify | Update selection... | Update + settings | Reset any sticky date/tag/-k options. | OK
+
+ If changes should also be merged into main trunk:

+
+

Merge changes from release candidate to main trunk: Modify | Update + selection... | Merge options | [select] Plus with this rev/tag: + RC_1_26_2 | [and above that, without selecting, enter ]Only the rev/tag: + RC_1_26_2_last_merge | OK
+
+ Commit merge results: Modify | Commit... | Enter log message: ... | OK

+
+
+
+
+

Release Procedures for the Release Manager

+

(To be supplied)

+

Acknowledgements

+

This web page was written by Beman Dawes, with helpful suggestions from Dave +Abrahams and Steve Robbins. Jim Hyslop contributed the detailed CVS procedures.

+
+

Revised: +28 January, 2002

+ + + + \ No newline at end of file