On 10/9/07, Brian Erickson <erickson@bauercontrols.com> wrote:
>
>
> Is this correct behavior?
It is.
> User 1:
> svn checkout http://snidely/svn/test user1
> cd user1
> svn delete test.txt (test.txt is no longer on user 1's hard drive)
This only marks the file, it does not actually delete it from the
repository. You need to call commit.
> User 2:
> svn checkout http://snidely/svn/test user2
> cd user2
> modify test.txt
> svn commit
>
> User 1:
> svn update
> test.txt is now back. (If this is desired, can someone explain to me the
> rational?)
The only change written to the repository is the one done by User2
(since User1 didn't commit the deleted file). So update got the file
from the repository. But...
> svn commit
> test.txt is left as an unversioned file (If leaving deleted and unchanged
> files around is desired, can someone explain to me the rational?)
When you do an update, your the changes from the repository get merged
with your local changes. Your file now contains changes from
repository (content) plus it is marked for deletion. When you commit,
the file gets deleted.
Matjaz
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 9 13:19:12 2007