Changes between Version 10 and Version 11 of ReleaseProcedure


Ignore:
Timestamp:
Oct 8, 2007, 3:53:39 AM (14 years ago)
Author:
Peter
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v10 v11  
    131131    [http://trac.thep.lu.se/trac/yat/admin/ticket/versions trac-admin tool].
    132132    Remember to set the date.[[br]][[br]]
    133  1. Merge the minor release into the trunk. To avoid confusion and
    134     minimize the risk of loosing fixes, this step is only performed by
    135     the ''Merge Master''. [[br]][[br]]
    136   i. Checkout a pristine version of the trunk.
    137 {{{
    138 svn checkout http://lev.thep.lu.se/repository/yat/trunk trunk_merge
    139 }}}
    140   i. Merge changes into trunk. In this example the diffence between a
    141      minor release tag and the first patch release tag is merged into
    142      the trunk WC
    143 {{{
    144 cd trunk_merge
    145 svn merge http://lev.thep.lu.se/repository/yat/branches/A.B-stable@fork_revision \
    146           http://lev.thep.lu.se/repository/yat/tags/A.B\
    147 }}}
    148   i. Resolve all conflicts. Run tests and perform all other
    149      appropriate tests to make sure that the merge does not create
    150      havoc. [[br]][[br]]
    151   i. Commit changes to the trunk branch.
    152 {{{
    153 svn commit -m "Merged patch release A.B.1 to the trunk. Delta A.B.1 - A.B"
    154 }}}
    155133 1. Create a distribution package:
    156134{{{
     
    205183  i. On WikiStart update links `[source:tags/A.B/NEWS NEWS]`.[[br]][[br]]
    206184  i. Generate documentation to new version of yat, and update link on WikiStart.[[br]][[br]]
     185 1. If required, merge the minor release into the trunk. To avoid confusion and
     186    minimize the risk of loosing fixes, this step is only performed by
     187    the ''Merge Master''. [[br]][[br]]
     188  i. Checkout a pristine version of the trunk.
     189{{{
     190svn checkout http://lev.thep.lu.se/repository/yat/trunk trunk_merge
     191}}}
     192  i. Merge changes into trunk. In this example the diffence between a
     193     minor release tag and the first patch release tag is merged into
     194     the trunk WC
     195{{{
     196cd trunk_merge
     197svn merge http://lev.thep.lu.se/repository/yat/branches/A.B-stable@fork_revision \
     198          http://lev.thep.lu.se/repository/yat/tags/A.B\
     199}}}
     200  i. Resolve all conflicts. Run tests and perform all other
     201     appropriate tests to make sure that the merge does not create
     202     havoc. [[br]][[br]]
     203  i. Commit changes to the trunk branch.
     204{{{
     205svn commit -m "Merged patch release A.B to the trunk. Delta A.B - A.B@fork_revision"
     206}}}
    207207 1. Close the [http://trac.thep.lu.se/trac/yat/roadmap milestone]
    208208    associated with the release and replace `head` with appropriate revision. Add a new milestone as needed (with log link).