boost/more
1
0
Fork 0
mirror of https://github.com/boostorg/more.git synced 2025-03-24 13:20:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

now fixes suggested be merged from trunk to branch

Browse Source 
[SVN r17747]
This commit is contained in:
Beman Dawes 2003-03-06 18:04:22 +00:00
parent 23a33ee64e
commit 117f43288c
1 changed files with 41 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
release_procedures.htm
View File

@ -40,12 +40,12 @@ logs, and committing fixes to CVS.</p>
<li>Discussion on the main Boost mailing list to determine the target date for <li>Discussion on the main Boost mailing list to determine the target date for
release candidate branch and tag of the CVS main trunk.<br> release candidate branch and tag of the CVS main trunk.<br>
&nbsp;</li> &nbsp;</li>
<li>Release manager performs release candidate branch and tag.<br> <li>Release manager performs release candidate branch, and also tags the
branch point in main trunk.<br>
&nbsp;</li> &nbsp;</li>
<li>Regression tests run on release candidate.<br> <li>Regression tests run on release candidate branch.<br>
&nbsp;</li> &nbsp;</li>
<li>Developers commit fixes to the release candidate branch (and possibly <li>Developers fix problems, test, and commit fixes. See below for details.<br>
merge into the main trunk - see below).<br>
&nbsp;</li> &nbsp;</li>
<li>Repeat previous two steps until release manager is satisfied.<br> <li>Repeat previous two steps until release manager is satisfied.<br>
&nbsp;</li> &nbsp;</li>
@ -71,98 +71,67 @@ logs, and committing fixes to CVS.</p>
Modified files committed to CVS on the main trunk will not be included in the release unless the Modified files committed to CVS on the main trunk will not be included in the release unless the
developer explicitly commits the changes to the release candidate branch.<br> developer explicitly commits the changes to the release candidate branch.<br>
&nbsp;</li> &nbsp;</li>
<li>To make a fix to the release candidate, the change must be committed to <li>If specific to the release candidate only, the fixes should be committed
the release candidate branch rather than the main trunk.&nbsp; Here is a directly to the release candidate branch. In the more common case of fixes
typical procedure (assuming the release candidate branch is named RC_1_26_2):</li> 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. <br>
<br>
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)
to merge the fixed main trunk into the release candidate branch:</li>
</ul> </ul>
<blockquote> <blockquote>
<ul> <ul>
<li>Command Line CVS:</li> <li>Command Line CVS:</li>
</ul> </ul>
<blockquote> <blockquote>
<pre>cvs update -r RC_1_26_2 [switch to the branch] <pre>[After fixed code is committed to main branch]
[modify buggycode.hpp] cvs update -r RC_1_26_2 [switch to the release candidate branch]
cvs commit buggycode.hpp cvs update -j HEAD buggycode.hpp [merge changes from the trunk to the branch]
[repeat modify/commit as desired] --&gt; RCS file: /cvsroot/boost/.../buggycode.hpp,v
--&gt; retrieving revision 1.4
--&gt; retrieving revision 1.6
--&gt; Merging differences between 1.4 and 1.6 into buggycode.hpp
[when ready for first merge] cvs commit -m &quot;Merged fix for problem xyz from trunk to branch&quot; buggycode.hpp
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 &quot;Merged from branch to trunk&quot; 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] [Repeat as needed]</pre>
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 &quot;Second merge from branch to trunk&quot; 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]
</pre>
</blockquote> </blockquote>
<ul> <ul>
<li>WinCVS:</li> <li>WinCVS:</li>
</ul> </ul>
<blockquote> <blockquote>
<p>Switch to branch: Select file(s), then Modify | Update selection... | <p>After fixed code is committed to main branch, switch to the release
Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK<br> candidate branch:</p>
<br>
Edit files needing fixes.<br>
<br>
Commit changes: Modify | Commit... | Enter log message: ... | OK<br>
<br>
Switch back to main trunk: Modify | Update selection... | Update settings |
Reset any sticky date/tag/-k options. | OK<br>
<br>
If changes should also be merged into main trunk:</p>
<blockquote> <blockquote>
<p>Merge changes from release candidate to main trunk: Modify | Update <p>Select file(s)</p>
selection... | Merge options | Only the rev/tag: RC_!_26_2 | OK<br> <p>Modify | Update selection... |
<br> Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK</p>
Commit merge results: Modify | Commit... | Enter log message: ... | OK</p>
</blockquote> </blockquote>
<p>Note that if a second or subsequent merge is required:</p> <p>Merge changes from main trunk into the release candidate branch:</p>
<blockquote> <blockquote>
<p>Switch to branch: Select file(s), then Modify | Update selection... | <p>Modify | Update selection... |
Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK</p> Update settings | Merge options | Only this rev/tag: HEAD | OK</p>
<p>Tag to keep track of last merge point: Modify | Create tag on </blockquote>
selection... | Enter tag name: RC_1_26_2_last_merge | Overwrite existing <p>Commit merge results:</p>
tags with same name | OK</p> <blockquote>
<p>Edit files needing fixes.</p> <p>Modify | Commit... | Enter log message: ... | OK</p>
<p>Commit changes: Modify | Commit... | Enter log message: ... | OK</p>
<p>Switch back to main trunk: Modify | Update selection... | Update
settings | Reset any sticky date/tag/-k options. | OK<br>
<br>
If changes should also be merged into main trunk:</p>
<blockquote>
<p>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<br>
<br>
Commit merge results: Modify | Commit... | Enter log message: ... | OK</p>
</blockquote>
</blockquote> </blockquote>
</blockquote> </blockquote>
</blockquote> </blockquote>
<h2>Release Procedures for the Release <a name="Manager">Manager</a></h2> <h2>Release Procedures for the Release <a name="Manager">Manager</a></h2>
<p>(To be supplied)</p> <p>At time of branch-for-release:</p>
<ul>
<li>Tag the main trunk&nbsp; <code>merged_to_RC_n_n_n</code>.</li>
<li>Branch the main trunk with the tag <code>RC_n_n_n</code>.</li>
</ul>
<h2><a name="Acknowledgements">Acknowledgements</a></h2> <h2><a name="Acknowledgements">Acknowledgements</a></h2>
<p>This web page was written by Beman Dawes, with helpful suggestions from Dave <p>This web page was written by Beman Dawes, with helpful suggestions from Dave
Abrahams and Steve Robbins. Jim Hyslop contributed the detailed CVS procedures.</p> Abrahams and Steve Robbins. Jim Hyslop contributed the original CVS procedures.
Updated by Jeff Garland after 1.29 release based on list discussions.</p>
<hr> <hr>
<p>Revised: <p>Revised:
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->28 January, 2002<!--webbot bot="Timestamp" i-checksum="38454" endspan --></p> <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->06 March, 2003<!--webbot bot="Timestamp" i-checksum="28840" endspan --></p>
</body> </body>