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

Re: Lock-Modify-Unlock vs Copy-Modify-Merge

From: <svn_at_orangeappeal.co.uk>
Date: 2004-10-11 18:38:01 CEST

I believe it boils down to this....

-If you have binaries in your repos that are generated by humans then
IMO Lock-Modify-Unlock is necessary.
-If an acceptable amount of the files in your repos are merge-able, then
Copy-Modify-Merge can work for you.

Copy-Modify-Merge requires a merge, in the case of text files (code)
this is trivial. In the case of binary files a merge is impossible
(unless a merge tool is available for that type of binary)

Lock-Modify-Unlock does not require a merge.

Lock-Modify-Unlock helps the scenario where only one person is allowed
to work on a file at a time. For example, when multiple artists are
working on a single MAX file or texture. Work can (and will) get lost
if you use the C-M-M method. As two or more artists work simultaneously
it will be impossible to merge their efforts when they finish, so work
is lost.

So, if your files are merge-able then the arguments for svn are (BTW
these are the ones I'm using on my boss)

- It's Free (SourceSafe isn't)
- There's a large, active and fresh community using it. (Don't use
"fresh" if your boss doesn't like new things and is afraid of change)
- Remote access becomes viable (AFAIK Source Safe does not allow this)
Tell your Boss he can work from home with Subversion.
- Microsoft internal development don't use SourceSafe, what does that
say about SS? (Can someone from MS confirm or deny this fact? they use
a Perforce derivative, but don't mention that because it's
Lock-Modify-Unlock too)
- BRANCHING! (this is the biggy, us it last) is a dream with Subversion
and a 'mare with SS

Hope this helps.

barry burnereau <barry_burnereau@yahoo.fr> wrote on 11.10.2004,
15:41:29:
> Hello
>
> My boss is asking me why we have to use
> Copy-Modify-Merge. He prefer Lock-Modify-Unlock
> (source safe in that case).
>
> I don't like sourcesafe, and I prefer using
> subversion... So my question is:
> Is somebody having an url or a document explaining why
> and when Copy-Modify-Merge is better. (i've read the
> book, but if I could have more arguments...)
>
> Thank's
>
> Barry
>
>
>
>
>
>
> Vous manquez d’espace pour stocker vos mails ?
> Yahoo! Mail vous offre GRATUITEMENT 100 Mo !
> Créez votre Yahoo! Mail sur http://fr.benefits.yahoo.com/
>
> Le nouveau Yahoo! Messenger est arrivé ! Découvrez toutes les nouveautés pour dialoguer instantanément avec vos amis. A télécharger gratuitement sur http://fr.messenger.yahoo.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 11 18:46:02 2004

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.