You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by David Frank <dn...@gmail.com> on 2006/04/06 20:57:42 UTC
svn switch problems
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
Re: svn switch problems
Posted by Matt Doran <ma...@papercut.biz>.
Thanks David,
I'll keep that in mind.
I'm now much more conservative with my switching. If I know it's going
to be a big feature with new directories, etc ... then a do a completely
separate checkout. Much less pain. :)
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:
> Yes this does sounds like the same/similar issue.
>
> To note however this afternoon. I had a 1.2.3 client installed and got
> my work area unusable.
>
> However I upgraded to 1.3.0 and although it still fails I was able to
> recover my work area.
>
> What i did was after the svn switch fails I run a svn status and can
> see the directory that was added has the ! symbol (missing).
>
> I can then completely remove that directory from my file system and
> then run an svn update. I can restart the switch and get where I want
> to be. Which is do a svn merge of the branch work back into the trunk.
>
> What is unfortunate is the need to delete files in order for the
> switch to succeed. Although the files being deleted are saved in the
> repository having to delete files to switch is a little unnerving.
>
> On 4/6/06, *Matt Doran* <matt.doran@papercut.biz
> <ma...@papercut.biz>> wrote:
>
> 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
> <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
> <ma...@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 <ma...@gmail.com>
>
>
>
>
> --
> Dave Frank
> dnfrank@gmail.com <ma...@gmail.com>
Re: svn switch problems
Posted by David Frank <dn...@gmail.com>.
Yes this does sounds like the same/similar issue.
To note however this afternoon. I had a 1.2.3 client installed and got my
work area unusable.
However I upgraded to 1.3.0 and although it still fails I was able to
recover my work area.
What i did was after the svn switch fails I run a svn status and can see the
directory that was added has the ! symbol (missing).
I can then completely remove that directory from my file system and then run
an svn update. I can restart the switch and get where I want to be. Which is
do a svn merge of the branch work back into the trunk.
What is unfortunate is the need to delete files in order for the switch to
succeed. Although the files being deleted are saved in the repository
having to delete files to switch is a little unnerving.
On 4/6/06, Matt Doran <ma...@papercut.biz> wrote:
>
> 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
>
>
--
Dave Frank
dnfrank@gmail.com
Re: svn switch problems
Posted by Matt Doran <ma...@papercut.biz>.
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 <ma...@gmail.com>