[TSVN] Re: un-adding files

JS.staff wrote:
> I did the following today:
>
> Tried to commit some work. Some files were new (didn't expect that!),
> so I ticked them to add, and pressed Commit Commit fails because I'm
> not up-to-date. Tried to Update, but I can't because HEAD contains
> the files now marked with '+' in my working copy! (some other guy had
> some the same work before me)

Communication!!!

> Is there a way to 'un-add' a file?? I got round the issue by copying
> out the work, reverting, updating, then copying the work back.

Yes, just revert it. I think the manual has been updated to include that
now.

> Is 'adding' a client only action?
Yes, until you commit.

> Can you revert an added file? Didn't try that.

See above, but it still won't get rid of the error. SVN is _very_
careful about not losing your local data, so it will not overwrite an
unversioned file with a versioned one - just in case you happen to have
a file with the same name as a completely different one someone else has
added. The only way you will get Update to work is to delete or rename
your local file.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 4 19:59:40 2004