Moving branch changes back to trunk

Hi all,

Probably an obvious question, but I'm just looking for a bit of guidance
from those with more subversion and SCM experience.

I've been doing a lot of development in a branch and could do with
moving that work back to trunk soon. The thing is that trunk actually
hasn't moved on at all since the branch was created - not a single
commit to it. In a way that should make things easier, but it leaves me
with a dilemma. How should I move that branch back to the trunk?

If trunk had changed since the branch was created then I'd be doing a
merge to bring the changes in from the branch. The merge really isn't
needed however because a straight "rename" of /branches/2.x to /trunk
would result in the same thing. Plus it means that there is one log
history for trunk, instead of some of the history being hidden in
/branches/2.x.

My idea is simply to delete /trunk and then move /branches/2.x to /trunk
- but that would result in there being a revision of the repository
without a /trunk which might prove 'surprising' at a later date. Unless
I check out the entire repository so that I can perform the change in
one commit - or is there an easier way?

Or am I just making everything too complex and I should just do the merge?

Thanks

Andrew

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 31 02:14:18 2005