Changes between Version 49 and Version 50 of ReleaseProcedure


Ignore:
Timestamp:
Apr 27, 2008, 11:54:49 PM (13 years ago)
Author:
Peter Johansson
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v49 v50  
    173173svn checkout http://lev.thep.lu.se/repository/svndigest/trunk trunk_merge
    174174}}}
    175    i. Merge changes into trunk. In this example the diffence between a
    176       minor release tag and the first patch release tag is merged into
    177       the trunk WC
     175   i. Merge changes in release branch since the fork into the trunk
    178176{{{
    179177cd trunk_merge
     
    317315   i. Resolve all conflicts. Run tests and perform all other
    318316      appropriate tests to make sure that the merge does not create
    319       havoc. [[br]][[br]]
     317      havoc. Note, changes in `version.m4` should typically not be merged into trunk.[[br]][[br]]
    320318   i. Commit changes to the trunk branch.
    321319{{{