Created by: Janine Graves on 14-11-2013 08:49:28 AM One of my students is asking what's best to manage their Studio source control. I hear Subversion is most common, but doesn't have the capability to 'lock' a file while it's checked out for editing." So - what actually works best? "The typical scenario is a developer imports the latest source code and begins working on a project that takes 3 months. During that time, there are 10 minor changes where the call flow is modified by adding a new form or audio element. The devloper on the project then has to manually recreate all the subsequent changes to the call flow which is prone to error."
Subject: RE: Studio Source Control recommendations Replied by: KRISTIAN MARTELL on 14-11-2013 10:46:03 AM Jannine, I have used a few in the past, CVS and SVN are the most popular and integrated with Studio. As far as Locking the application, I am not sure that is really what your developers will want according to your post. If the main developer has the file checked out for long periods of time and the system locks the file they will not be able to make any other changes unless the main developer checks in the application. SVN does not lock the applications but it does keep track of all changes being made to the application. The Subclipse plug-in for Studio works really well and even has a Syncronizer View that shows you any chages that deviate for the reposiry copy. This is both incomming and outgoing. So given your example a main developer can have a copy checked out for a month or so without cheking in any changes. While he has it chcked out some other developer can change the file and check it back in. At that time the main developer's sychronizer should see this change and allow the developer to download the changes that were made. As long as there are no confilcts with what he has in his own copy the cange is inported nice and clean. If SVN does see a conflict the developer is presented with a coice on how to handle it. They can either Merge the chage (not recommended) or they can create a new branch of the code to allow for a seperate path for his changes.
I hope this helps.
Subject: Re: New Message from KRISTIAN MARTELL in Customer Voice Portal (CVP) - Gene Replied by: Janine Graves on 14-11-2013 11:23:33 AM The Subclipse plugin and Synchronizer sound perfect - I hadn't heard of them. Are they both part of SVN? or CVS? Or just independent plugins to Eclipse?
Subject: RE: New Message from KRISTIAN MARTELL in Customer Voice Portal (CVP) - Gene Replied by: Hemal Mehta on 14-11-2013 12:40:33 PM You can merge text based files. However the call flow itself will require manually editing and merging.
From: Cisco Developer Community Forums [mailto:email@example.com] Sent: Thursday, November 14, 2013 11:43 AM To: firstname.lastname@example.org Subject: New Message from KRISTIAN MARTELL in Customer Voice Portal (CVP) - General Discussion - All Versions: RE: Re: New Message from KRISTIAN MARTELL in Customer Voice Portal (CVP) -