Question

I did a few things wrong while merging trunk into a branch. First I thought it’s easier to checkout a new working copy of the trunk and add all changes “by hand”. Then I thought it’s ok to remove the branched “src” folder and overwrite it with the “src” from the trunk. Now it’s clear that the .svn folders aren’t the right folders (as they belong to the trunk instead of to the branch). So I decided to delete all .svn folders, but now I don’t know how it’s easiest to add it to the branch once again or how to create a new branch with all my changes.

I suppose I did everything wrong so far…

I think I will disconnect my project, checkout the head revision of the branch, but then again I somehow want to “override” the branch, that is more or less replace the whole “src”-folder (standard maven layout).

Well it’s more or less that I can disconnect my changes from svn, which is essentially the current state (“src” is not a working copy, as such I can also disconnect everything). Alternatively I have a copy without the removed .svn folders, but the .svn folders point to the trunk, that’s the whole problem.

kind regards,
Johannes

Answer 1

Following steps that I use when I want to replace something from another branch into another branch or whatever (under Windows):

1) checkout latest copy of the original branch from the SVN server. Let say this is the original copy {A}

2) make a copy of your working copy. Let say this is the modified copy {B}

3) change directory to the root of your {B} and remove hidden .svn folders from all folders and subfolders of {B}

CD "{B}"

FOR /F "tokens=*" %G IN ('DIR /B /AD /S *.svn*') DO RMDIR /S /Q "%G"

4) copy {B} to {A}

5) commit {A}