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

Re: avoid overwriting new files in the Repository during commit

From: Clemens Schwaighofer <cs_at_tequila.co.jp>
Date: 2004-12-08 07:38:07 CET

Hash: SHA1

On 12/08/2004 03:29 PM, Ben Collins-Sussman wrote:
> On Dec 7, 2004, at 11:06 PM, Clemens Schwaighofer wrote:
>> Hash: SHA1
>> Hi,
>> I have just a small question.
>> I have User A who works on file.pl and User B who does the same. User A
>> changes something and commits, User B does the same right afterwards,
>> without updateing his local copy.
>> Subversion says nothing and just overwrites the file on the server.
> That's not true at all! If so, it would completely violate the entire
> concurrent "copy, modify, merge" model used by both CVS and Subversion.
> What happens is: User B tries to commit, and gets an error message
> saying that the commit failed because his copy of file.pl is "out of
> date". User B is then forced to update and merge changes before
> retrying the commit.
> What makes you think otherwise?

Because I just tried it out, and I thought I would get an error message.

Now I tried it again, and I get the correct error message. I really
don't know what I did, but I was sure I
- - updated both trees
- - changed in Tree A and commited
- - changed in Tree B and commited without and getting an error

I am glad I was totaly wrong, and I am sorry for the noise.

- --
[ Clemens Schwaighofer -----=====:::::~ ]
[ TBWA\ && TEQUILA\ Japan IT Group ]
[ 6-17-2 Ginza Chuo-ku, Tokyo 104-0061, JAPAN ]
[ Tel: +81-(0)3-3545-7703 Fax: +81-(0)3-3545-7343 ]
[ http://www.tequila.co.jp http://www.tbwajapan.co.jp ]
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 8 07:40:24 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.