>- see footer for list info -< If you only one 1 active branch at a time then this is fine.
But all the models shown in SVN Books when you have multiple active branches is to merge the trunk down to these when a change / another branch is merged into trunk. But as you say there are multiple ways of doing this and you just need to find the way that works for you. ---------------------------------------------------------------------- [ ] internal [ ] private [X] ask first [ ] bloggable ---------------------------------------------------------------------- Kev McCabe Adobe Community Professional - ColdFusion UK ColdFusion User Group Manager tel: +44 7751 230 725 email: [email protected] skype: bigmadkev blog: http://bigmadkev.com/blog ---------------------------------------------------------------------- On 11 August 2010 10:07, Michael Traher <[email protected]> wrote: > >- see footer for list info -< > we don't merge trunk back to branches, but if a branch gets old we create a > new branch from the latest trunk and then merge the old branch to the new > branch. > > e.g. > So on Jan 1st we create 'ABC-123' branch, some work gets done, then it gets > shelved for a while. On 1st March we want to work on it again but we know > trunk has had some big changes in the last 2 months, so we create a brand > new shiny ABC-123-A then merge ABC-123 (the original) into this new shiny > branch and we can continue working. > > Just another way to cut it, but tends to be a simpler merge, and we only do > it if the branch 'gets old' which is a very subjective thing. > > > > On 10 August 2010 18:03, Kev McCabe <[email protected]> wrote: > > > >- see footer for list info -< > > The Key to using TortieseSVN and an Eclipse Plugin, is to ensure your > > Eclipse SVN Plugins are upto date. > > > > It's all about the minor Version release i.e. 1.4 / 1.5 / 1.6 (the sub > > releases shouldn't affect the client tools 1.6.1 or 1.6.2 as per the SVN > > Mantra) > > > > When you install Subversive for the first time, you are asked which > > Connectors to install, be safe and install all of them. > > > > Then within Eclipse > Preference > Team > SVN you can choose which > > Connector > > / Version to use that fits the working copy you are using at the moment. > Of > > course you should really be using the same version across all your > working > > copies no matter what the server is as that is another point on the SVN > > Mantra that Major Version of the Server should work with all Minor > Version > > releases or something along those lines IIRC. > > > > As for Branching / Merging etc. Micheal is right. > > > > Simply put - Create a Branch for any major (or minor in mycase) of work > you > > want to do. Once you're happy merge back into the trunk and delete the > > branch as soon as you can. Branches shouldn't live for long,. > > If you have multiple branches, when you merge back into trunk you need to > > then merge these changes back down to the branches so that when you come > to > > merge the branch back into the trunk you only merge back the changes you > > have made in the branch for the project. > > > > And also tagging is good for releases so you can roll back, this also > helps > > when you want to patch a release you can create the patch for that > release > > only tag it and release then the change you have made you merge back into > > your trunk (And of course then merge down to existing branches) so that > all > > future releases get the updates > > > > SVN 1.6 has made this a lot easier with the improved Merge Tracking (Also > > when ever you do a merge and you notice it's updated properties on files > > not > > touched you need them as they contain the merge tracking) > > > > I find using the Eclipse Plugins good for the day 2 day administration of > > Subverison during development, but when it comes to merging from branch > to > > trunk or trunk to branch ToirtieseSVN wins it has a nice wizard to take > you > > through this. > > > > I'm hoping to put together a few screencasts on this in due course once I > > have them done I will ping the list. > > > > In all honestly it really is a mind messer when dealing with SCM and > > multiple developers but remember to Update Your Working Copy Regular, > Merge > > Trunk down to branches when trunk changes, and the big one is Communicate > > you don't believe how silly that sounds but keep the communication > channel > > open between developers after all as BT Said It's Good To Talk :) > > > > The Book that helped me was: Pragmatic Version Control: Using Subversion > - > > > > > http://www.amazon.co.uk/Pragmatic-Version-Control-Subversion-Programmers/dp/0977616657/ref=sr_1_1?ie=UTF8&s=books&qid=1281459729&sr=8-1 > > > > Helped me get my head around a lot of as did > > http://svnbook.red-bean.com/which is the free online version of the > > book that is printed. > > > > Cheers > > > > ---------------------------------------------------------------------- > > [ ] internal [ ] private [ ] ask first [X] bloggable > > ---------------------------------------------------------------------- > > Kev McCabe > > Adobe Community Professional - ColdFusion > > UK ColdFusion User Group Manager > > tel: +44 7751 230 725 > > email: [email protected] > > skype: bigmadkev > > blog: http://bigmadkev.com/blog > > ---------------------------------------------------------------------- > > _______________________________________________ > > > > For details on ALL mailing lists and for joining or leaving lists, go to > > http://list.cfdeveloper.co.uk/mailman/listinfo > > > > -- > > CFDeveloper Sponsors:- > > >- cfdeveloper Hosting provided by www.cfmxhosting.co.uk -< > > >- Lists hosted by www.Gradwell.com -< > > >- CFdeveloper is run by Russ Michaels, feel free to volunteer your help > -< > > > > > > -- > Regards Mike > _______________________________________________ > > For details on ALL mailing lists and for joining or leaving lists, go to > http://list.cfdeveloper.co.uk/mailman/listinfo > > -- > CFDeveloper Sponsors:- > >- cfdeveloper Hosting provided by www.cfmxhosting.co.uk -< > >- Lists hosted by www.Gradwell.com -< > >- CFdeveloper is run by Russ Michaels, feel free to volunteer your help -< > _______________________________________________ For details on ALL mailing lists and for joining or leaving lists, go to http://list.cfdeveloper.co.uk/mailman/listinfo -- CFDeveloper Sponsors:- >- cfdeveloper Hosting provided by www.cfmxhosting.co.uk -< >- Lists hosted by www.Gradwell.com -< >- CFdeveloper is run by Russ Michaels, feel free to volunteer your help -<
