Changes between Version 26 and Version 27 of ReleaseProcedure


Ignore:
Timestamp:
Mar 25, 2008, 9:07:32 AM (14 years ago)
Author:
Nicklas Nordborg
Comment:

Corrected merge instructions

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v26 v27  
    301301{{{
    302302cd trunk_merge
    303 svn merge http://base.thep.lu.se/svn/tags/A.B \
    304           http://base.thep.lu.se/svn/tags/A.B.1
     303svn merge http://base.thep.lu.se/svn/tags/A.B.[C-1] \
     304          http://base.thep.lu.se/svn/tags/A.B.C
    305305}}}
    306306  i. Resolve all conflicts. Run tests and perform all other
     
    309309  i. Commit changes to the trunk branch.
    310310{{{
    311 svn commit -m "Merged patch release A.B.1 to the trunk. Delta A.B.1 - A.B"
    312 }}}
     311svn commit -m "Merged patch release A.B.C to the trunk. Delta A.B.C - A.B.[C-1]"
     312}}}