Changes between Version 10 and Version 11 of pm-svn-branches


Ignore:
Timestamp:
Oct 13, 2006 5:48:14 PM (13 years ago)
Author:
andreasw
Comment:

added instructions how to apply a changeset to different branch

Legend:

Unmodified
Added
Removed
Modified
  • pm-svn-branches

    v10 v11  
    100100
    101101Note: Once you have successfully synchronized {{{stable/2.5}}} with {{{trunk}}}, you should commit the changes in {{{sytable/2.5}}} and '''include the current repository number in your commit message, so that you know the beginning point for your next marge operation.'''
     102
     103=== Applying a changeset to a different branch ===
     104
     105Another typical example is that you are working on some branch (say, {{{trunk}}}), and you are committing a change to this branch (such as a bugfix), which you also want to apply to another branch (say, you stable branch {{{stable/2.5}}}).  If the committed change for {{{trunk}}} brought your subversion repository revision number from N to N+1 (say, from 465 to 466), you can then type
     106{{{
     107svn merge -r 465:466 https://projects.coin-or.org/svn/Prjct/trunk
     108}}}
     109in your local working copy of {{{stable/2.5}}}.  This will try to merge the changeset 466 into your local copy.  If the files to which changes are applied have not divergted too much, this should work without problems, but you should check in any case if the patch is applied correctly.