Vendor branch hell

[Scott Palmer <sc...@2connected.org>]

I'm using Subverison 1.1.2 client on Win XP
The server is Subversion 1.1.3 on Wind XP, FSFS backend, accessed via 
svn://

I followed the advice in the Subversion book to create vendor branches.

I use a URL->WC copy to put the vendor code under my project folder 
hierarchy

current working folder is a WC of the root of the repository, but most 
of the folders I mention below have not ever been committed yet.  I'm 
moving a lot of projects into this WC and adjusting the structure for 
the initial add to the subversion repository.  I'm doing this in groups 
of related projects.

mkdir projA
mkdir projA/SDK
mkdir projA/SDK/SomeVendor/
svn add projA
cd projA/SDK/Vendor

I have already committed various third party APIs to the repository
So I copy one of them into this project.

svn cp svn:/repo/ThirdParty/sdk/current  CoolAPI
A  ...
A  ...(all files from the third party API are listed)
...

Before I commit I realize, oops.. I copied the wrong API.. I will 
revert that copy and copy the correct one.

cd projA/SDK/SomeVendor
svn st
A       .
A   +  CoolAPI
svn revert CoolAPI
svn: working copy 'Vendor/CoolAPI' not locked

Huh???

Now everything I try to recover claims that some dang thing is not 
locked... I can't get rid of the entire SDK folder under projA, I can't 
revert it I cant 'rm' it, 'svn cleanup' does nothing, etc.  I've 
manually deleted folders hoping that I could get subversion to just 
forget about the entire subfolder... but it always claims that 
something is not locked, so I can't even remove the folders from my WC.

Basically the entire projA can't be committed because of some tiny 
thing that went wrong in a single subfolder with no way to back out.   
So I have to recreate an entirely new (and somewhat huge) image of my 
WC from the parent of projA

My attempt to follow the practices in the subversion book and use cheap 
copies etc are getting me very frustrated because this 'not locked' 
issue is constantly getting in the way.  I have no idea what I do to 
trigger it, but once it is there the entire WC all the way up the 
hierarchy is ruined.

I also run into a case where everything commits but then the WC fails 
to update somehow and it claims the revision number could not be 
bumped.  When that happens I delete that folder of the WC and to an 
'svn up' and it seems to get fixed.

It seems the WCs become extremely fragile if I use a URL->WC copy into 
a folder that has never been committed to the repository, but has been 
added to the WC.

Scott


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Vendor branch hell

[Scott Palmer <sc...@2connected.org>]

I managed to delete my 'not locked' working folders with the --force 
option.  I don't know why I didn't think of it before.

I still wish I understood what got me into that situation in the first 
place.

Scott


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org