[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Re: Subversion 101: To lock or not to lock..

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-06-09 02:21:03 CEST

On 6/8/06, Sinang, Danny <D.Sinang@spi-bpo.com> wrote:
> IMHO, I've done some HTML / ASP programming before. If it's in any way
> similar to JSP, then perhaps your developers could separate the
> presentation, business, and data-layer code into modules or files to
> lessen the chance of editing the same file.
> Does this make sense ?

That's good practice no matter what. But it's still very possible for
two people to need to simultaneously edit the same utility function
"library" files.

> I'm also an SVN newbie, but don't merge conflicts only happen if 2
> people modify the same line(s) of code ? If so, then what are the
> chances of your developers doing so ?

You're pretty much dead-on there. If you have 2 people in the exact
same section of code at the same time, you're going to have a conflict
anyway, just in a different way - Developer A needs change X to a
function, Dev B needs change Y, they're going to bump heads no matter

No SCM system can cure a lack of communication. It can enable and
assist communication at the code level, but if the developers aren't
talking (which sounds like it may be the case), the project is already
in trouble - and fighting over lock vs. copy/merge in Subversion isn't
going to save it.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 9 02:22:22 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.