0

I looked at how to create trunk directory in existing svn repo without a trunk and move all, and it might be applicable, however, I have a "trunk" but the manner in which the developer, a senior one at that, imported the project to the svn repos may provide a difference worth review.

It appears, looking at the log, that the developer locally created a svn tree, a trunk/branches/tags directory, created all the files in the branches directory, then on the initial import to svn, committed trunk and tags as part of the branches commit.

This means there's no history of a copy to a branch. The log, in near-fidelity, is:

% cd work
% mkdir -p project/trunk project/branches project/tags
% cd project/branches
... begin a bunch of work on a java service v1.0
... happy lets import to svn
% cd ..
% pwd project
% svn import -m"Initial import"
A branches
A branches/file-n
A branches/file-n ...
A tags
A trunk
Sending...
Committed rn
% svn mv $repos/project $repos/project_name
...
Committed rn

So svn merge does not really work here. trunk is part of the initial commit, history is not really allowing a clean merge.

Could I use the copy and commit suggestion above? Or is there another way that is necessary in this case?

Community
  • 1
  • 1
javafueled
  • 494
  • 1
  • 5
  • 23
  • 1
    It's possible I'm missing something, but it sounds like your goal is to move everything from /branches/branch1/file1, etc. to /trunk/file1, etc. Seems like svn move would solve this... – ThatBlairGuy Nov 08 '10 at 19:52
  • Yes, and no. Without history on trunk, I can't just `svn move` to trunk. That would bring the history of the branch to trunk, but leave the branch empty. Unfortunately, *our* build "process" would croak on that. I did "solve" it though. Maybe not the based a recommendation, but it accomplished what *our* organization would find acceptable: copy the files to trunk, commit, and branch for a new release line. – javafueled Nov 09 '10 at 11:30

1 Answers1

0

I solved this with a combination of a couple of things here at SO.

Ultimately, a move would not have worked for our organization's build process. This would have kept the branch history on trunk, but left the branch empty. Our builds would not have liked that.

I instead copied the files to the trunk directory, sans .svn directories of course, via svn export and committed them.

Now, some might say, you just lost history. I'm not so sure about that. The history of the branch is still there, and a new branch was created from trunk. The previous branch remains active and can be retired is process allows, tagged EOL, etc.

Feedback welcome.

javafueled
  • 494
  • 1
  • 5
  • 23