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

On 8 Jun 2006, at 22:18, Michael March wrote:
[snip]
> I showed everyone THE page in the official manual and they don't seem
> to care. I shared my previous expereiences on other projects and that
> didn't move them. Their line is this: In the new way of fast paced
> Java web programming.. you are going to have a ton of conflicts and
> merges all the time and it thus it doesn't lend itself to the
> 'non-locking' way of using Subversion.
[snip]

In my experience the more often your committing/merging the less
sense locking makes. The quicker you find and identify conflicts the
easier they are to resolve. Hiding them behind locking and branches
causes more problems than it solves.

It sounds like your group might be locked into the "this is my code"
mindset rather than "this is our code" maybe?

You might want to read the rather spiffy (IMHO anyway) "Software
Configuration Management Patterns: Effective Teamwork, Practical
Integration" by Steve Berczuk with Brad Appleton. Lots of excellent
advice.

Hope this helps (and my sympathies :-)

Cheers,

Adrian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 8 23:43:50 2006