On 2013-12-12 12:29-0000 Andrew Ross wrote: > > Jerry, > > The philosophy of svn is more to intelligently merge changes when more > than one person is working on the same file.
Hi Jerry: To expand further on what Andrew said, I suggest you read http://svnbook.red-bean.com/en/1.7/svn.basic.version-control-basics.html. There are some instances (for binary files) where locking is considered to be OK, but in practice it is rarely used, and colloborative development of files (the whole point of using subversion) is strongly encouraged instead. Of course, the downside of that collaborative model is the occasional conflict where by chance two developers work on the same area of the file at the same time. For further background on that, I suggest you read http://svnbook.red-bean.com/en/1.7/svn.tour.cycle.html with emphasis on the section concerning special subversion tools available now to help resolve conflicts. Note, it has been so long since I had to deal with a conflict that I haven't yet had a chance to use those modern conflict-resolution tools. Instead I resolved conflicts the old-fashioned way by editing the file in question, finding the areas of conflict which typically look like this: <<<<<<< filename your changes ======= code merged from repository >>>>>>> revision to denote the two possible versions of that area, and choosing one version over the other by deleting the alternative (and conflict markers) from the file. But whether you use the modern or old-fashioned methods to resolve conflicts, the point is it's a completely straightforward process so there is normally no need to lock files to avoid this process at the expense of losing all the benefits of collaborative development. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/plplot-devel
