Branching in SVN - Lock Error?

Questions and answers regarding the use of eclipse environment as seen in Servoy Developer

Branching in SVN - Lock Error?

Postby Kahuna » Wed Jul 29, 2009 2:25 pm

Attempting to Branch in SVN (Project Locker) and getting the following Error:

svn: Commit failed (details follow):
svn: No write-lock in 'C:\Servoy4_1_3\WK_Space\XXX_XXXX_01\forms'

I can sync and commit no problem - and its only the branch that is raising this lock error. I tried Clean-up but that made no difference. Restarted Eclipse several times again with no result.

Is there a specific set of steps I should adopt to get this lock activated?
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: Branching in SVN - Lock Error?

Postby jcompagner » Wed Jul 29, 2009 4:21 pm

if you want to branch, why dont you just do that in the svn repository view?

just make a copy of trunk (or whatever dir you want to branch)
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Branching in SVN - Lock Error?

Postby Kahuna » Wed Jul 29, 2009 5:50 pm

jcompagner wrote:if you want to branch, why dont you just do that in the svn repository view?

just make a copy of trunk (or whatever dir you want to branch)


Not sure what you mean Johan.

I have the SVN Repositories Tab (View) open, and I can copy any of the entries there.

How do I paste the directory back in though?

And how do I then ensure I'm in that duplicated Trunk for development (is it then a branch or a trunk)?

How can I merge them back when the Branch needs it?
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: Branching in SVN - Lock Error?

Postby jcompagner » Wed Jul 29, 2009 5:58 pm

for example you have (all in repositories view)

/trunk/myproject

and you want to branch that to /branches/mysuperbranch

first make a dir "mysuperbranch" in "/branches"
then copy myproject from "trunk"
and paste that one into the just created dir "/branches/mysuperbranch"

then in your eclipse workspace switch to that branch with Team->switch to branch/revision

and change the trunk url to the branch url

Ofcourse you have to first commit everything before you do it all.
You should if you want to start a branch always first create the branch, switch to it, then do you changes and commit on the branch.

then if you have done all your changes to the branch and you want to merge this back to trunk

switch back to trunk (you can use different workspaces for this 1 for the trunks projects and 1 form the branch projects)

then do team -> merge

If you use the subclipse as your svn provider that the latest 1.6.x version has a nice merge client where you can merge from branch back to trunk very nicely through a wizard. (and have graphical output if there is a conflict)
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Branching in SVN - Lock Error?

Postby Kahuna » Wed Jul 29, 2009 6:06 pm

Brill thanks Johan.

I'll take that route.

Cheers

Ian
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: Branching in SVN - Lock Error?

Postby Kahuna » Wed Jul 29, 2009 6:50 pm

Johan - further challenges I'm afraid. I branched as you suggested, the complication is that I have two modules shared in SVN too.

At first (following your advice) I built the directory and copied the root in there. Trying to switch to this branch caused an error where the Modules could not be found. Then I copied the roots for the Modules too, to the branch, and first switched those to the branch in the solution.

When switching the branch for the main solution I get these errors:

Switch operation failed.
Switch operation failed.
Switch operation failed.
svn: Target path '/branches/Ians_Branch_1/tci_excorr_01/Base_Security' does not exist
svn: REPORT of '/TCI_Services/TCI_Excorr_Base/svn/!svn/vcc/default': 500 Internal Server Error (https://free2.projectlocker.com)

svn: Target path '/branches/Ians_Branch_1/tci_excorr_01/Base_Training' does not exist
svn: REPORT of '/TCI_Services/TCI_Excorr_Base/svn/!svn/vcc/default': 500 Internal Server Error (https://free2.projectlocker.com)

svn: Target path '/branches/Ians_Branch_1/tci_excorr_01/tci_excorr_01' does not exist
svn: REPORT of '/TCI_Services/TCI_Excorr_Base/svn/!svn/vcc/default': 500 Internal Server Error (https://free2.projectlocker.com)

Patently these paths do exists? Did I miss something Johan?

I've also tried to switch to another branch created by another developer (who can create and switch to it BTW) yet I get the same errors with that.

Alternatively - going back to my previous question - can you suggest why these files cant be locked by SVN to create a Branch automatically?
Last edited by Kahuna on Wed Jul 29, 2009 7:32 pm, edited 1 time in total.
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: Branching in SVN - Lock Error?

Postby jcompagner » Wed Jul 29, 2009 7:31 pm

I would then just re checkout everything.
Just delete the projects and checkout the branch projeccs.
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Branching in SVN - Lock Error?

Postby Kahuna » Wed Jul 29, 2009 7:38 pm

jcompagner wrote:I would then just re checkout everything.
Just delete the projects and checkout the branch projeccs.


Any comment on why the svn cant get a lock Johan?
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: Branching in SVN - Lock Error?

Postby jcompagner » Wed Jul 29, 2009 7:42 pm

no, dont know what version you use and what client adapter.
There are so many things that can be a factor.

also if you look in the repository view do you see that target path?

just do a clean checkout
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Branching in SVN - Lock Error?

Postby Kahuna » Wed Jul 29, 2009 7:56 pm

jcompagner wrote:no, dont know what version you use and what client adapter.
There are so many things that can be a factor.

also if you look in the repository view do you see that target path?

just do a clean checkout


Thanks Johan - did a re-checkout of the solution, overwriting the local version from svn root, and reactivated. This allowed me to use - Branch in team without error. I guess something went out of whack in the solution in my workspace.
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain


Return to Eclipse Environment

Who is online

Users browsing this forum: No registered users and 3 guests