Need to cancel added files, do not commit to repo.

Is this possible? I can see any options for it and I've had issues with this
in the past.

I've added a directory structure (data\hhl\*), there was a server problem and I
wasn't able to commit immediately. A coworker then added the same directory
structure plus some different subfolders (data\scripts\*) so the actual files
don't conflict. But my commit fails because the top folder (data) already
exists.

I can't commit the (hhl\) subfolder because it doesn't allow committing only
part of some added files.
I can't commit the whole thing because (data\*) is already on the repo.
I can't update from the repo because (data\) exists locally
I'm afraid to delete added files because last time I did that it caused some a
bunch of problems.

Is there a clean way to "unadd" files from the project so I can resolve this
mismatch?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 20:35:35 2006