Hi there,
Yes, I also found the same problem a few months ago. Unfortunately it
hasn't been fixed. Here's the link to the issue:
http://subversion.tigris.org/issues/show_bug.cgi?id=2466
The working copy gets broken, and there is not an obvious way to fix
it. I think I had to do a clean checkout.
Hopefully one of the subversion devs can fix this soon.
Regards,
Matt Doran
PaperCut Software Pty. Ltd.
Phone: +61 (3) 9571 1151
E-mail: matt.doran@papercut.biz
Profile: http://www.papercut.biz/company.htm#matt
Blog: http://blogs.papercutsoftware.com/matt.doran/
David Frank wrote:
> Hello,
>
> I am currently trying to resolve a issue related to developing work in
> a branch
>
> Here is what did
>
> 1) checkout trunk
> 2) create a branch of the trunk for my task
> 3) svn switch my checkout of the trunk to the branch
> 4) develop changes including adding new directories and files
> 5) commit all changes to my branch
> 6) switch back work area back to the trunk so i can merge back to trunk.
>
> I get errors related to the newly created directories the error i get is
>
> svn: Won't delete locally modified directory 'src'
> svn: Left locally modified or unversioned files
>
> the src directory above is where contains my new directories.
>
> doing a svn status i get
>
> ! .
> ... //snipped
> ! src
> ... //snipped
> ! S src\SerialProtocol
> ? src\SerialProtocol\objects\vxworks
> ! src\SerialProtocol\objects
>
> In this case SerialProtocol is my new directory.
> if i delete SerialProtocol from my disk and then do a svn update I can
> then do complete the switch command
>
> The reason for the switch back to the trunk is so that i can do
>
> svn merge -r <start>:head <branchurl>
>
>
> Now another thing this only appears to happen if i have intermediate
> files sitting around. ie non versioned files
> How can I do the switch back without having to manually delete
> files/directories???
>
>
>
> --
> Dave Frank
> dnfrank@gmail.com <mailto:dnfrank@gmail.com>
Received on Fri Apr 7 02:31:29 2006