Merging issues - after change in package structure

[Mita Majumdar <mi...@ideafarms.com>]

Hello and greetings to every one!

I am using SVN for quite a while but all I know is the basic stuff 
and nothing much in detail. I will try to explain the problem in as 
much detail as possible.

The structure of SVN repositories that we have:
1.We have a distributed development environment, by which I mean we 
have two SVN repositories (One at the client side and a local at our side).
2.When ever we are required to deliver the code to client we use SVK 
to sync and merge the trunk of both the SVN repositories.
3.The development for the project is not done in the trunk of the 
local repository but is done in a branch, and before the delivery 
changes in the branch are merged to the trunk.
4.The merge from branch  to the trunk is done using 
eclipse/subeclipse merge functionality.

The changes that we did in the branch of the local repository:
1.We changed the package structure
2.We changed the name of the packages (changed the upper case letters 
in the package name to lower case letters)
3.Change the name of the classes
4.After the restructuring there were some bug fix and enhancements in the code

How we merge the changes of local branch to the trunk:
We use the subeclipse merge functionality
Step 1 - Check out a project from the trunk
Step 2 - Right click on the project and select team-> merge
Step 3 - Select the local branch from which the changes are to be merged
Step 4 - Select the revision till where the changes are to be merged 
and click on the merge button in the dialog
Step 5 - The changes that are merged and stored in the project are 
committed to the trunk by right clicking on the project and selecting 
team -> commit.

The problem while merging the changes in the local branch to local trunk:
1. The problem occurs when the subversions merge command tries to 
merge the changes in the trunk
2. Following is the error
Attempted to lock an already-locked dir
svn: Working copy 'C:\project\........\dimension\dimensionlogic' locked
3. I have checked there is no lock applied externally on the folder.
4. There has been change in the packaging of folder and the name of 
the folder/package is changed from "dmensionLogic" to "dimensionlogic"



I am not able to figure out why is this problem occurring. Is there 
any solution to this or any other alternative way to merge the 
changes so that we don't loose the history of the files and packages.

Any help or advice is highly appreciated.

----------------------------------
Warm Regards,
Mita Majumdar
mita.majumdar@ideafarms.com
IdeaFarms
(A division of Confidign Solutions P Ltd.)
B-25 (1st floor)
Okhla Phase-1
New Delhi- 20
India

Tel: +91-11-2681 8255, +91-11-5564 9267
Fax: +91-11-2637 1361
http://www.ideafarms.com
----------------------------------