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

add merged_to tag update instructions

Browse Source 
[SVN r17748]
This commit is contained in:
Beman Dawes 2003-03-06 18:25:31 +00:00
parent 117f43288c
commit 49995de199
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
release_procedures.htm
View File

@ -86,6 +86,7 @@ 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 -j HEAD 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
@ -101,17 +102,23 @@ 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, switch to the release <p>After fixed code is committed to main branch, tag as the new merged
candidate branch:</p> point:</p>
<blockquote>
<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>
<p>Switch to the release candidate branch:</p>
<blockquote> <blockquote>
<p>Select file(s)</p>
<p>Modify | Update selection... | <p>Modify | Update selection... |
Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK</p> Update settings | Sticky options | Retrieve rev/tag/branch: <code>RC_1_26_2</code> | OK</p>
</blockquote> </blockquote>
<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: HEAD | OK</p> Update settings | Merge options | Only this rev/tag: <code>HEAD</code> | OK</p>
</blockquote> </blockquote>
<p>Commit merge results:</p> <p>Commit merge results:</p>
<blockquote> <blockquote>