Changes between Version 12 and Version 13 of ReleaseProcedure


Ignore:
Timestamp:
Jun 27, 2007, 3:10:24 PM (13 years ago)
Author:
Jari Häkkinen
Comment:

Updated merging information.

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v12 v13  
    241241svn checkout http://lev.thep.lu.se/repository/svndigest/trunk trunk_merge
    242242}}}
    243   i. Merge changes into trunk. In this example the tag starts at
    244      revision N and end at revision M.
     243
     244  i. Merge changes into trunk. In this example the diffence between a
     245     minor release tag and the first patch release tag is merged into
     246     the trunk WC
    245247{{{
    246248cd trunk_merge
    247 svn merge -r N:M http://lev.thep.lu.se/repository/svndigest/tags/A.B.C
     249svn merge http://lev.thep.lu.se/repository/svndigest/tags/A.B \
     250          http://lev.thep.lu.se/repository/svndigest/tags/A.B.1
    248251}}}
    249252  i. Resolve all conflicts. Run tests and perform all other
    250253     appropriate tests to make sure that the merge does not create
    251254     havoc. [[br]][[br]]
    252   i. Commit changes to trunk.
    253 {{{
    254 svn commit -m "Merged log:tags/A.B.C#N:M"
     255  i. Commit changes to the trunk branch.
     256{{{
     257svn commit -m "Merged patch release A.B.1 to the trunk. Delta A.B.1 - A.B"
    255258}}}
    256259 1. Close the milestone associated with the release and add a new