Changes between Version 4 and Version 5 of pm-svn-branches


Ignore:
Timestamp:
May 29, 2006 3:00:03 PM (14 years ago)
Author:
andreasw
Comment:

final first draft changes

Legend:

Unmodified
Added
Removed
Modified
  • pm-svn-branches

    v4 v5  
    2020  -------- tags
    2121}}}
     22
     23You can find out more about the subversion commands used here by typing {{{svn help command}}}, or look at our short documentation [wiki:pm-svn-cmds here].
    2224
    2325== Creating New Branches and Tags ==
     
    7375}}}
    7476
    75 This will get all the changes that happened in {{{Coin-Prjct/branches/devel}}} since revision number 123 and apply those changes to your local copy of {{{trunk}}}.  If you have made no local modifications in {{{trunk}}} (and it is a good idea do keep it that way), everything should just work fine.  If you have local modification in your {{{trunk}}} copy, you might encounter conflicts that you have to resolve, just as if you have done an {{{svn commit}}} and encountered conflicts (see the description of {{{svn commit}} [wiki:pm-svn-cmds here]).
     77This will get all the changes that happened in {{{Coin-Prjct/branches/devel}}} since revision number 123 and apply those changes to your local copy of {{{trunk}}}.  If you have made no local modifications in {{{trunk}}} (and it is a good idea do keep it that way), everything should just work fine.  If you have local modification in your {{{trunk}}} copy, you might encounter conflicts that you have to resolve, just as if you have done an {{{svn commit}}} and encountered conflicts (see the description of {{{svn commit}}} [wiki:pm-svn-cmds here]).