Kevin Dangoor wrote: > On 4/13/06, Michele Cella <[EMAIL PROTECTED]> wrote: > > 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/ > > It may be faster to have a separate directory with a checkout of the > 1.0 branch. That's how I was doing 0.8 changes. >
Yes, this should be a lot faster, even more here on my horrible connection that's also the reason I haven't used another checkout. :D > > 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 > > Right now it doesn't make a difference, but I'm going to suggest > switching this around. Make the change on the branch first, and then > merge it to the trunk. The reason I say this is that we're going to be > putting a whole bunch of stuff on the trunk that we don't want to > merge to the branch. > Yep, otherwise we get firstclass thing in 1.0. :D I should keep this in mind, thanks for pointing these things out. ;-) 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 -~----------~----~----~----~------~----~------~--~---
