Samuel Winchenbach wrote:
> This may be a question that has been asked before, but I could not find
> an answer.
>
> Assume there is a file "about.doc" in the working directory
>
> Now I delete "about.doc", and commit the changes.
> My friend Ryan has modified his working copy of "about.doc"
Sorry to say that, but this would be a good example of very bad
communication between your team members.
> When Ryan runs "commit" he recieces a message saying "Commit failed ...
> file not found about.doc"
As the error message indicates: the file "about.doc" is not found
because you have deleted it.
> When Ryan runs "update" he recieves a message saying "Will not delete
> locally modified file about.doc"
That's Subversions policy: never loose data. Since Ryan has modified the
file (and not yet committed) the update which would delete the file
won't happen - deleting that file would mean that Ryan looses his
modifications to that file.
> So how do you handle this situation in all cases:
> 1) Keeping Ryan's modified about.doc
Make a copy of the file. Then do a "revert" to undo the changes Ryan
made and then update. The file "about.doc" is now deleted, but Ryan
still has a "Copy of about.doc" which he can now decide what to do with.
He can even rename the "Copy of about.doc" back to "about.doc" and add
it again to version control.
> 2) Deleting about.doc from Ryan's working directory
Do a "revert" on Rayan's "about.doc" and then update.
> We have tried the following:
>
> Ryan has tried deleting the file using Windows Explorer. The commit
> succeeded, but when he attempted to run "update" he got an error message
> saying "can't copy about.doc.svn-base to about.doc.svn-base.tmp the
> system cannot find the file specified"
The problem you see here is caused by the interrupted "update" you tried
before. The working copy is still in an "intermediate" state. After an
interrupted command you should (at least if you get such cryptic error
messages) do a "cleanup". The command "cleanup" restores the working
copy to a good state (i.e. it cleans up left log files of the last
command, clears locks, ...).
> So... we recreate the problem exactly as about.
>
> Ryan tries the Tortise "Delete" function on his locally modified copy of
> "about.doc" which has been deleted from the repository by me.
> Ryan then commits his change to the repositry (this works fine)
> Ryan then does an"update" and gets the following message "can't copy
> about.doc.svn-base to about.doc.svn-base.tmp the system cannot find the
> file specified"
Again, do a "cleanup" before you proceed any further. Your working copy
is in an "interrupted" state and must be cleaned up before any other
commands can be used successfully.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 23 22:51:30 2004