Home | Libraries | People | FAQ | More |
Introduction
Procedure Overview
Procedures for Developers
Procedures for the Release Manager
Acknowledgements
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.
- Command Line CVS:
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]
- WinCVS:
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: ... | OKNote 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
(To be supplied)
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