On Friday 09 June 2006 01:43, L. Wayne Johnson wrote:
> >> "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."
>
> This statement does not make sense to me. On the one hand merging the file
> is too time consuming so you must lock it. On the other hand locking the
> file does not cause a problem because nobody else will be working on it.
>
> Either more than one person is going to edit the file or not.
A lock communicates that someone else is working on a file before(!) you start
working on it too (i.e. before you spend time/money/effort working on it).
This then gives you a chance to first coordinate changes with the other
person.
The alternative is that both change the file and the second one to commit
changes first has to merge the other changes. In cases where merging is more
time consuming than the communicate-before-edit approach above it is useful
to lock files. In particular when you can't automate merging (like with many
binary formats) this is the case.
Uli
****************************************************
Visit our website at <http://www.domino-printing.com/>
****************************************************
This Email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this Email in error please notify the system manager.
This footnote also confirms that this Email message has been swept by MailSweeper for the presence of computer viruses.
****************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 9 10:00:57 2006