You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Clemens Schwaighofer <cs...@tequila.co.jp> on 2004/12/08 05:06:32 UTC
avoid overwriting new files in the Repository during commit
-----BEGIN PGP SIGNED MESSAGE-----
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. Is
there no way to at least spit out a warning, that you are about to
overwrite a new file on the server? Or is this impossible because my
local copy doesn't know that, because I have not updated it ?
This is just one thing I am afraid that might happen if some people work
on the same project and forget to update before they commit.
Eviroment:
Subversion 1.1.1 server on redhat 9.0 (db backend)
windows xp pro 2 with tortoise svn
gentoo x86/stable with svn 1.1.1 from portage tree
- --
[ 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 ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFBtovYjBz/yQjBxz8RAvWSAKCLha8wKKWz9zZE62L1XcdZw0ii3ACfbrn0
gb3VWRgHQO6wJbO1rnYXMGk=
=smyA
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: avoid overwriting new files in the Repository during commit
Posted by Clemens Schwaighofer <cs...@tequila.co.jp>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12/08/2004 03:48 PM, kfogel@collab.net wrote:
> If Subversion is really doing tihs, it's a bug, because it should not
> allow B to commit from an out-of-date file. Subversion has enforced
> the up-to-date requirement since Day One, though, and I highly doubt
> such a major bug is present.
>
> Can you show us a transcript of what you do?
I tried it again and again but I can't reproduce the bug. I seriously
hope it was just stupidity from me and not a bug from subversion. But I
will monitor this closely (we are in a test phase for subversion now)
and will report any kind of strange behaviour in this way as soon as
possible.
- --
[ 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 ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFBtqg/jBz/yQjBxz8RAgZlAKCDZg4z2/z99gs1rgAmKeT4RDsWxwCbBtqS
+TZCI9J2WNyZCPv2uBNMqY0=
=Bj9e
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: avoid overwriting new files in the Repository during commit
Posted by kf...@collab.net.
Clemens Schwaighofer <cs...@tequila.co.jp> writes:
> 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. Is
> there no way to at least spit out a warning, that you are about to
> overwrite a new file on the server? Or is this impossible because my
> local copy doesn't know that, because I have not updated it ?
If Subversion is really doing tihs, it's a bug, because it should not
allow B to commit from an out-of-date file. Subversion has enforced
the up-to-date requirement since Day One, though, and I highly doubt
such a major bug is present.
Can you show us a transcript of what you do?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: avoid overwriting new files in the Repository during commit
Posted by Clemens Schwaighofer <cs...@tequila.co.jp>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12/08/2004 03:29 PM, Ben Collins-Sussman wrote:
>
> On Dec 7, 2004, at 11:06 PM, Clemens Schwaighofer wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> 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 ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFBtqFOjBz/yQjBxz8RAmVBAJ9PmVIgfcK0gshwRbz6hWcF/iFUmwCfSXcc
sbnN0phHbSz9IGpnkI5lCRM=
=rl0V
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: avoid overwriting new files in the Repository during commit
Posted by Ben Collins-Sussman <su...@collab.net>.
On Dec 7, 2004, at 11:06 PM, Clemens Schwaighofer wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> 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?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org