boost/more
1
0
Fork 0
mirror of https://github.com/boostorg/more.git synced 2025-02-27 09:40:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved presentation (Gennadiy)

Browse Source 
[SVN r17821]
This commit is contained in:
Beman Dawes 2003-03-11 20:37:10 +00:00
parent 164b98f737
commit 7523019953
1 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
release_procedures.htm
View File

@ -87,50 +87,88 @@ logs, and committing fixes to CVS.</p>
<li>Command Line CVS:</li>
</ul>
<blockquote>
<pre>[After fixed code is committed to main branch]
cvs update -r RC_1_26_2 [switch to the release candidate branch]
cvs update -j<a href="#merged_to_RC_n_n_n">merged_to_RC_1_26_2</a> -jHEAD buggycode.hpp [merge changes from trunk to branch]
<ul>
<li>Fixed code is committed to main branch <br>
&nbsp;</li>
<li>Switch to the release candidate branch
<blockquote>
<code>cvs update -r RC_1_26_2</code></blockquote>
</li>
<li>Merge changes in a trunk since previous merge to branch
<blockquote>
<pre>cvs update -j<a href="#merged_to_RC_n_n_n">merged_to_RC_1_26_2</a> -jHEAD buggycode.hpp
--&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
cvs commit -m &quot;Merged fix for problem xyz from trunk to branch&quot; buggycode.hpp
cvs update -A [go back to main trunk]
cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp [tag new merged point]
[Repeat as needed]</pre>
--&gt; Merging differences between 1.4 and 1.6 into buggycode.hpp</pre>
</blockquote>
</li>
<li>Commit merged branch
<blockquote>
<pre>cvs commit -m &quot;Merged fix for problem xyz from trunk to branch&quot; buggycode.hpp</pre>
</blockquote>
</li>
<li>Go back to main trunk
<blockquote>
<pre>cvs update -A</pre>
</blockquote>
</li>
<li>Move tag to a new merged point
<blockquote>
<pre>cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp</pre>
</blockquote>
</li>
<li>Repeat as needed
</li>
</ul>
</blockquote>
<ul>
<li>WinCVS:</li>
</ul>
<blockquote>
<p>After fixed code is committed to main branch, switch to the release
candidate branch:</p>
<ul>
<li>After fixed code is committed to main branch, switch to the release
candidate branch:</li>
</ul>
<blockquote>
<blockquote>
<p>Select file(s) if not already selected.</p>
</blockquote>
<blockquote>
<p>Modify | Update selection... |
Update settings | Sticky options | Retrieve rev/tag/branch: <code>RC_1_26_2</code> | OK</p>
</blockquote>
<p>Merge changes from main trunk into the release candidate branch:</p>
</blockquote>
<ul>
<li>Merge changes from main trunk into the release candidate branch:</li>
</ul>
<blockquote>
<blockquote>
<p>Modify | Update selection... |
Update settings | Merge options | Only this rev/tag: <code>
<a href="#merged_to_RC_n_n_n">merged_to_RC_1_26_2</a></code>
| Plus with this rev/tag: <code>HEAD</code> | OK</p>
</blockquote>
<p>Commit merge results:</p>
</blockquote>
<ul>
<li>Commit merge results:</li>
</ul>
<blockquote>
<blockquote>
<p>Modify | Commit... | Enter log message: ... | OK</p>
</blockquote>
<p>Go back to main trunk:</p>
</blockquote>
<ul>
<li>Go back to main trunk:</li>
</ul>
<blockquote>
<blockquote>
<p>Modify | Update selection... | Update settings | Reset any sticky
date/tag/-k options | OK</p>
</blockquote>
<p>Tag as new merge point:</p>
</blockquote>
<ul>
<li>Tag as new merge point:</li>
</ul>
<blockquote>
<blockquote>
<p>Modify | Create tag on selection... | Create tag settings | Enter the tag
name to create: <code>merged_to_RC_1_26_2</code>, Overwrite existing tags
@ -138,6 +176,7 @@ cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp [tag new merged point]
</blockquote>
</blockquote>
</blockquote>
</blockquote>
<h2>Release Procedures for the Release <a name="Manager">Manager</a></h2>
<p>At time of branch-for-release:</p>
<ul>