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

add merged_to tag instructions

Browse Source 
[SVN r17750]
This commit is contained in:
Beman Dawes 2003-03-06 18:45:03 +00:00
parent 49995de199
commit 11955c9d5f
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
release_procedures.htm
View File

@ -86,15 +86,16 @@ logs, and committing fixes to CVS.</p>
</ul> </ul>
<blockquote> <blockquote>
<pre>[After fixed code is committed to main branch] <pre>[After fixed code is committed to main branch]
cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp [tag new merged point]
cvs update -r RC_1_26_2 [switch to the release candidate branch] cvs update -r RC_1_26_2 [switch to the release candidate branch]
cvs update -j HEAD buggycode.hpp [merge changes from the trunk to the branch] cvs update -jmerged_to_1_26_2 -jHEAD buggycode.hpp [merge changes from the trunk to the branch]
--&gt; RCS file: /cvsroot/boost/.../buggycode.hpp,v --&gt; RCS file: /cvsroot/boost/.../buggycode.hpp,v
--&gt; retrieving revision 1.4 --&gt; retrieving revision 1.4
--&gt; retrieving revision 1.6 --&gt; retrieving revision 1.6
--&gt; Merging differences between 1.4 and 1.6 into buggycode.hpp --&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 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> [Repeat as needed]</pre>
</blockquote> </blockquote>
@ -102,15 +103,11 @@ cvs commit -m &quot;Merged fix for problem xyz from trunk to branch&quot; buggyc
<li>WinCVS:</li> <li>WinCVS:</li>
</ul> </ul>
<blockquote> <blockquote>
<p>After fixed code is committed to main branch, tag as the new merged <p>After fixed code is committed to main branch, switch to the release
point:</p> candidate branch:</p>
<blockquote> <blockquote>
<p>Select file(s) if not already selected.</p> <p>Select file(s) if not already selected.</p>
<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
with same name | OK.</p>
</blockquote> </blockquote>
<p>Switch to the release candidate branch:</p>
<blockquote> <blockquote>
<p>Modify | Update selection... | <p>Modify | Update selection... |
Update settings | Sticky options | Retrieve rev/tag/branch: <code>RC_1_26_2</code> | OK</p> Update settings | Sticky options | Retrieve rev/tag/branch: <code>RC_1_26_2</code> | OK</p>
@ -118,12 +115,24 @@ cvs commit -m &quot;Merged fix for problem xyz from trunk to branch&quot; buggyc
<p>Merge changes from main trunk into the release candidate branch:</p> <p>Merge changes from main trunk into the release candidate branch:</p>
<blockquote> <blockquote>
<p>Modify | Update selection... | <p>Modify | Update selection... |
Update settings | Merge options | Only this rev/tag: <code>HEAD</code> | OK</p> Update settings | Merge options | Only this rev/tag: <code>merged_to_1_26_2</code>
| Plus with this rev/tag: <code>HEAD</code> | OK</p>
</blockquote> </blockquote>
<p>Commit merge results:</p> <p>Commit merge results:</p>
<blockquote> <blockquote>
<p>Modify | Commit... | Enter log message: ... | OK</p> <p>Modify | Commit... | Enter log message: ... | OK</p>
</blockquote> </blockquote>
<p>Go back to main trunk:</p>
<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>
<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
with same name | OK.</p>
</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>