Changes between Version 56 and Version 57 of ReleaseProcedure


Ignore:
Timestamp:
Nov 22, 2009, 5:57:39 AM (11 years ago)
Author:
Peter Johansson
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v56 v57  
    190190svn diff
    191191}}}
    192   i. Merge changes into trunk WC.
     192   i. Merge changes into trunk WC.
    193193{{{
    194194svn merge http://dev.thep.lu.se/svndigest/svn/branches/A.B-stable@fork_revision \
    195195          http://dev.thep.lu.se/svndigest/svn/tags/A.B
    196196}}}
    197   i. Resolve all conflicts. Run tests and perform all other
     197   i. Resolve all conflicts. Run tests and perform all other
    198198     appropriate tests to make sure that the merge does not create
    199199     havoc. Typically changes in `m4/version.m4` are problematic
    200200     so check this file extra carefully.[[br]][[br]]
    201   i. Commit changes to the trunk branch.
     201   i. Commit changes to the trunk branch.
    202202{{{
    203203svn commit -m "Merged release A.B to the trunk. Delta A.B - A.B@fork_revision"