Re: [TSVN] TortoiseSVN - FAQ

Jeremy wrote:
> I'm currently developping an application with friends. We often
> modify the same files at the same time and when we commit we're
> discovering that.
> Is there a way in Tortoise to lock files under modification for other
> users until they're committed or unlocked ??

That is the normal way of working for subversion, although optional
locking will be introduced in release 1.2 (due April/May). But the
locking is really intended as a way of preventing 2 people from editing
a non-mergeable file (like a graphics file), where one persons changes
will have to be discarded. For plain text files, merging changes
generally works very well. It's what we use for TSVN and there are
rarely any conflicts, because different people are usually working on
different things, even if they work in the same file. Read the
subversion book, or chapter 2 of the TSVN manual to find out why the
CVS/SVN methods actually work better in most cases than locking methods.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org