> Sven,
> I do see your point about not wanting to overwrite a file in the user's
> wc when trying to add a new file that has already been committed to the
> repository, and I agree that it is valid that this should be an error
> condition, and should be brought to the attention of the user.
>
> However, I am not sure that the state of the wc after this failure is
> desirable. Even after removing the offending file, an update produces an
> error of the form "File not found: transaction 'nn' etc".
> There can be many instances of .svn/entries files that have the
> "incomplete=true" flag, and there is the potential that only some of the
> changes in the new revision have been applied before the error, the
> remainder have not been applied.
>
> What would be the recommended recovery action if the "already exists"
> error occurred, in order to be sure of a known state of the wc?
>
> Thanks for your help.
>
> Brian.
>
>
>
Personally, i think it should treat it as a conflict, and in general
it handles it really poorly. However in reading these emails, I don't
seem to see cleanup mentioned once. When this happens, and after
removing the conflicting file, have you tried doing an svn cleanup?
Usually when I get errors like you describe, part of the message says
i should do an svn cleanup. It's quite possible it will basically do
the manual steps you describe as far as the incomplete=true etc.
Those are possibly flags specifically made for cleanup to handle.
- Jody
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Mar 8 05:28:17 2006