Michele Cella wrote: > Kevin Dangoor wrote: > > > > Here are some tips: > > > > http://www.reactos.org/wiki/index.php/Best_practices_for_working_with_branches > > > > The basic idea is to use the svn merge command to pull changes from > > one side to the other. > > > > This looks like a very good set of tips. ;-) > > Thanks Kevin. > > Ciao > Michele
Ok, my little tutorial: 1) Do your work in the trunk and commit your changes: Committed revision 1144. 2) From your top level dir: svn switch http://www.turbogears.org/svn/turbogears/branches/1.0/ 3) Search for the latest merge that has been done (in my case Max at r1142), what you need is: svn merge -r 1142:1144 http://www.turbogears.org/svn/turbogears/trunk 4) Commit it with a message like this to keep track of the last merge: svn commit -m "Merged 1142:1144 from trunk" 5) Switch back to trunk: svn switch http://www.turbogears.org/svn/turbogears/trunk Ciao Michele --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "TurboGears Trunk" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/turbogears-trunk -~----------~----~----~----~------~----~------~--~---
