At 12:12 PM 6/12/06 +0100, David Harrigan wrote:
>[...]
>now that we want to merge the
>development branch into the trunk, we are presented
>with a shed load of conflicts.
>
>I checked out the trunk and ran this:
>
>svn merge http://server/project/branch/project@12
>http://server/project/branch/project@HEAD
>
>where 12 is the revision number that we created the branch from.
>
>I'm thinking it would be just a lot simplier to replace the current
>trunk completely with the current head of the branch (since the branch
>contains everything the trunk has and more...)
>
>What would be the best way to achieve this?
>
>-=david=-
I didn't see any answers to this. I am by no stretch qualified to give
advice and in fact most of the time the posted answers surprise me. But,
anyway, an idea from "off the wall".
All this "structure" in the repo is really just copies. So...
- copy the trunk to a branch (or tag), assuming you want to remember
where you ditched it.
- make a new directory, say, 'new', so now you have trunk, tags,
branches, and new.
- svn delete trunk
- svn rename 'new' to 'trunk'.
Hope this isn't flat wrong. The trunk you end up with now should trace its
origins back through the branch it came from, and so on.
Barry
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 14 21:50:25 2006