Switching problem

Hello,

Switching won't work for some reason.
I have a project in its working copy: C:\devl\project1

This project has a trunk and a feature branch I have been working on for
some time (the trunk has not evolved in the meantime). In the feature
branch, I did add a folder, renamed an other one, modified and added
some files.

Now I want to port this branch to the trunk: so I committed all my
changes in the branch, and tried to switch to the trunk, but I got the
following message:

Error: Won't delete locally modified directory 'C:\devl\project1'

What does this mean? There are no pending modifications in my project
since I took care to commit everything before switching.

If I try to cleanup, I get:

Subversion reported an error while doing a cleanup!
C:\devl\project1\subdir is not a working copy directory.

where subdir is a directory I added in the branch (hence not present in
the trunk where I want to switch to). Is this a problem? Files in this
subdir have been deleted by the switch, so that I'm stuck with an
ill-formed working copy now... (I have backups, fortunately).

(I don't know if this is relevant, but the "subdir" itself contains sub
directories and files that are not under version control).

What should I do now?

Thanks in advance,

Vincent.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sun Apr 16 20:07:53 2006