On Monday 02 April 2007 16:45, igor vieira wrote:
> tks for all answers...
>
> And yes im a begginer; trying join this svn world. =)
>
> If i have a lock on this file, so it will not merge?
> I think in this way: If a guy update a file and it overwrite to
> repository version, commit will not be possible.
> I tried simulate this action, but no sucess. It didnt merged (if i
> have same version), it didnt replaced too.
>
> I asked for some more information but the guy couldnt send more.
> btw i need study it a little more because plp doesnt want merge
> solution.
I guess the problem is that you desire a "The Lock-Modify-Unlock
Solution"? That is discussed fairly well at
http://svnbook.red-bean.com/
Especially read, "When Locking is Necessary", because you can still
enable the Locking if it is really needed. But from what you say,
your guys are used to it but don't need it and they should stop the
locking nonsense and start collaborating, instead.
What confuses me is that you imply that you are already locking, yet
you say the guy might "update a file and it overwrite to repository
version". How is that possible if the file were correctly locked? How
did you lock it?
The update merging is not an issue if you are using the
Lock-Modify-Unlock solution.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 5 18:41:49 2007