Test to production or test to qa to production...same process. If you have multiple developers, you can have multiple branches...one for each developer or use a separate branch for each project. They then merge their changes and deal with conflict resolution as need be. SVN will automatically merge changes as long as they don't conflict. If there is a conflict, it will tell you and give you the opportunity to either resolve the conflict via svn diff or ignore it and just copy over your code.
Eric /*-----Original Message----- /*From: Andrew Scott [mailto:[EMAIL PROTECTED] /*Sent: Monday, August 11, 2008 8:05 PM /*To: CF-Talk /*Subject: RE: SVN in Production /* /*For FUCK sake. /* /*I never said anything about merging between SVN repositories. /* /*I fucking said merging code from dev -> production, which has nothing to /*do /*with SVN what so ever that is my damn point. /* /*You bring automation into this, and I am fairly sure that I have been /*talking about using SVN in production. If I am as a developer, have made /*it /*very clear that not all my changes or even yours could end up in /*production. /*So how do you handle that? /* /*It has nothing to do with automation of any shape or form. /* /*I have been talking about deployment the entire time, WTF do you think I /*mean when I talk about merging fixes/changes from QA -> PRODUCTION /* /*Did you think I had 2 repositories in SVN called QA and Production? /* /*Give me a break..... /* /* /* /*-- /*Senior Coldfusion Developer /*Aegeon Pty. Ltd. /*www.aegeon.com.au /*Phone: +613 9015 8628 /*Mobile: 0404 998 273 /* /* /* /* /*-----Original Message----- /*From: Brian Kotek [mailto:[EMAIL PROTECTED] /*Sent: Tuesday, 12 August 2008 10:34 AM /*To: CF-Talk /*Subject: Re: SVN in Production /* /*I never said you would automatically handle merge changes. If you are /*merging, then you do that in the repository and tag the merged file set /*before you perform the deployment. That has nothing to do with deployment. /*You only deploy once the code has been properly merged, tagged, and /*tested. /* /*To anyone else interested in this topic, I would recommend that you look /*around for yourself by Googling "ant deployment" or "svn deployment" and /*look through the hundreds of thousands of results from a very wide range /*of /*authoritative sources. You'll quickly see that a great many people /*successfully leverage Subversion when deploying code. /* /* /*On Mon, Aug 11, 2008 at 8:09 PM, Andrew Scott /*<[EMAIL PROTECTED]>wrote: /* /*> Brian... /*> /*> A statement like this means you are not very good at your job. /*> /*> There is no way to automatically merge changes, I mean even SVN can't do /*> that between developers and its a manual process to update and merge /*> changes. /*> /*> Brian, if you have been developing and using SVN heavily and making /*minor /*> changes to websites as explained there is no way in hell I would employ /*you /*> if you told me what you said below. /*> /*> As much as I am one who looks to reduce work load, file sync is and will /*> always be a manual process when it comes to migrating small changes. /*> /*> Brian, you really should read your message again and seriously think /*about /*> what you said. /*> /*> /*> /*> -- /*> Senior Coldfusion Developer /*> Aegeon Pty. Ltd. /*> www.aegeon.com.au /*> Phone: +613 9015 8628 /*> Mobile: 0404 998 273 /*> /*> /*> /*> /*> -----Original Message----- /*> From: Brian Kotek [mailto:[EMAIL PROTECTED] /*> Sent: Tuesday, 12 August 2008 12:01 AM /*> To: CF-Talk /*> Subject: Re: SVN in Production /*> /*> I disagree completely. There's absolutely nothing wrong with using SVN /*in /*> production for deployment. /*> /*> Beyond Compare? It's a great program...but using it to deploy code? The /*> idea /*> makes me shudder. In fact, doing anything manual related to code /*deployment /*> makes me shudder. /*> /*> There are easy ways around the issue you bring up about size: it's /*called /*> an /*> SVN Export. It's meant to do EXACTLY what you're talking about: create a /*> copy of the source code with no SVN-related files. /*> /*> All of this can (and should) be automated with ANT. That means at the /*click /*> of my mouse I can execute the entire deployment process in exactly the /*same /*> way every single time. That might mean: /*> /*> - Zip the current code, timestamp it, and copy it to a back folder for /*> easy retrieval. /*> - Delete the current code /*> - Copy a site maintenance file into the site folder /*> - Pull latest from SVN /*> - Perform export to site folder /*> - Run a reinit HTTP request to reload the application /*> - Send an email to notify stakeholders of success /*> /*> You can also have it run unit tests and only deploy if all tests pass. /*> /*> The bottom line is that using SVN and ANT to help you deploy code is /*> EXACTLY /*> what these tools were meant to do. If I have to do anything more than /*click /*> my mouse once to execute an entire deployment process, I'm doing /*something /*> wrong. /*> /*> /*> On Mon, Aug 11, 2008 at 4:20 AM, Andrew Scott /*> <[EMAIL PROTECTED]>wrote: /*> /*> > SVN SHOULD NEVER BE USED IN PRODUCTION... /*> > /*> > SVN is used to have a revision control system, so that you could roll /*> back /*> > to a previous version or whatever you need to do. /*> > /*> > When it comes to production, why the hell would you install 99% of /*extra /*> > space taking codes and indexes to a production server? Over a period /*of /*> > time, your code might be 1meg in size, but after a year the SVN /*indexes /*> > could result in 2gig and more of space that is no longer needed. But /*then /*> > if /*> > one read the docs to these tools, one would not use SVN in production. /*> > /*> > SVN can be expensive when it comes to hard drive space, and one should /*> > never /*> > and I will repeat this again. /*> > /*> > NEVER USE SVN in production. /*> > /*> > Use a program like beyond compare to syn file changes or something, /*but /*> > NEVER USE SVN in production. /*> > /*> > I am shocked to find people don't research their tools enough. /*> > /*> > So let me recap, DO NOT USE SVN IN PRODUCTION. If you do then your a /*damn /*> > fool, and should be shot on sight. /*> > /*> > /*> > /*> > -- /*> > Senior Coldfusion Developer /*> > Aegeon Pty. Ltd. /*> > www.aegeon.com.au /*> > Phone: +613 9015 8628 /*> > Mobile: 0404 998 273 /*> > /*> > /*> > /*> > /*> > -----Original Message----- /*> > From: Kym Kovan [mailto:[EMAIL PROTECTED] /*> > Sent: Monday, 11 August 2008 11:07 AM /*> > To: CF-Talk /*> > Subject: SVN in Production /*> > /*> > Hello, /*> > /*> > Looking at some of the responses in the recent thread on SVN v ftp I /*get /*> > an impression that some folk are using SVN clients on Production /*boxes. /*> > What are people's thoughts on this? Is it a security risk, is it /*> > dangerous in some other way, or is it a "bad thing" because of all of /*> > those extra files that cause havoc with backups? /*> > /*> > -- /*> > /*> > Yours, /*> > /*> > Kym Kovan /*> > mbcomms /*> > /*> > /*> > /*> > /*> > /*> > /*> /*> /*> /*> /* /* /* /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Adobe® ColdFusion® 8 software 8 is the most important and dramatic release to date Get the Free Trial http://ad.doubleclick.net/clk;203748912;27390454;j Archive: http://www.houseoffusion.com/groups/CF-Talk/message.cfm/messageid:311210 Subscription: http://www.houseoffusion.com/groups/CF-Talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=89.70.4
