We use subversion with coldfusion, and haven't had any issues relating to conflicts that couldn't easily be solved through the diff tool in tourtoise or subclipse... Its perfectly fine for 2 people to modify the same html file and if they're not working on the same change, subversion will usually merge the changes quite gracefully.
Sent wirelessly via BlackBerry from T-Mobile.
From: "Michael March" <email@example.com>
Date: Thu, 8 Jun 2006 16:23:30
Subject: Re: Subversion 101: To lock or not to lock..
Ok.. I printed out all the excellent comments from all of you and had
meeting with the 'pro-locking' factions here at the ranch.
A lot of the issues of why people want locking is because of a general
lack of training and knowledge of how and why Subversion works. As the
SCM this is my fault and its up to me to fix those issues.
However, of all the points the 'pro-lock' people made.. this one has
the most weight in my opinion. Here is a quote re:JSP and XHTML.. see
what you guys and gals think:
"When editing an html or jsp file, it is often necessary to modify
many parts of the file. If someone else is also editing the same
file, merging the changes can be extremely time consuming, as it is
hard for subversion to reconcile and display the diffs correctly (this
is from experience). Locking provides a safeguard from having to
endure the merge process but does not stop people from getting their
job done, because you should never have two people working on the same
html/jsp file at the same time."
On 6/8/06, Michael March <firstname.lastname@example.org> wrote:
> I am the new guy on a young project.. the project has 10 -> 15 Java
> developers. The app is a JBoss app that implements the JBoss Portal
> (kinda like a Java version of PHPNUKE).
> The project is only a few months old and the project is constantly
> changing.. very much in flux.
> Here is the problem, I am the SCM on the project and I am telling
> everyone based on my experience no one should be locking of any files
> (text) on check out. Everyone else on the project is insisting that
> some files should be locked on check out.
> 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.
> Does anyone have any advice for what I should say or how to handle
> this situation?
> Or.. is their anyone out there using a locking model when working on a
> Java web project?
> Michael F. March ----- mmarch_aaattt_gmail.com
> "Seriously" - HSR
Michael F. March ----- email@example.com
Ph: (415)462-1910 ---- Fax: (602)296-0400
P.O. Box 2254 ---- Phoenix, AZ 85002-2254
"Seriously" - HSR
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Fri Jun 9 01:35:16 2006