diff --git a/release_procedures.htm b/release_procedures.htm index fb050e8..555de8f 100644 --- a/release_procedures.htm +++ b/release_procedures.htm @@ -87,55 +87,94 @@ logs, and committing fixes to CVS.

  • Command Line CVS:
    • - 
    [After fixed code is committed to main branch]
-cvs update -r RC_1_26_2 [switch to the release candidate branch]
-cvs update -jmerged_to_RC_1_26_2 -jHEAD buggycode.hpp [merge changes from trunk to branch]
+
    +
    + +
  • Commit merged branch +
    +
    cvs commit -m "Merged fix for problem xyz from trunk to branch" buggycode.hpp
    +
    +
    • +
  • Go back to main trunk +
    +
    cvs update -A
    +
    +
    • +
  • Move tag to a new merged point +
    +
    cvs tag -F -c merged_to_RC_1_28_2 buggycode.hpp
    +
    +
    • +
  • Repeat as needed +
    • +
    -

    After fixed code is committed to main branch, switch to the release - candidate branch:

    +
    +

    Select file(s) if not already selected.

    -
    -

    Modify | Update selection... | Update settings | Sticky options | Retrieve rev/tag/branch: RC_1_26_2 | OK

    +
    -

    Merge changes from main trunk into the release candidate branch:

    +
    +

    Modify | Update selection... | Update settings | Merge options | Only this rev/tag: merged_to_RC_1_26_2 | Plus with this rev/tag: HEAD | OK

    +
    -

    Commit merge results:

    +
    +

    Modify | Commit... | Enter log message: ... | OK

    +
    -

    Go back to main trunk:

    +
    +

    Modify | Update selection... | Update settings | Reset any sticky date/tag/-k options | OK

    +
    -

    Tag as new merge point:

    + +

    Modify | Create tag on selection... | Create tag settings | Enter the tag name to create: merged_to_RC_1_26_2, Overwrite existing tags with same name | OK.

    +

    Release Procedures for the Release Manager