Replacing the Trunk with a Branch

Hi,

We have been working to this model:-

* qa branch

**** which is merged into the

* trunk (which is released)

**** which is merged into

* a new development branch

All swimmingly.

However, 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=-

This email and the files transmitted with it are meant solely for the use of the individual addressee(s) named above. They may contain confidential and/or legally privileged information. If you are not the addressee(s) or responsible for delivery of the message to the addressee(s), please delete it from your system and contact the sender right away. The opinions, conclusions and other information in this message which do not relate to the official business of Orange Home UK plc are not necessarily endorsed by it. Orange Home UK plc has taken steps to ensure that this email and any attachments are virus-free, but it remains your responsibility to confirm and ensure this.

Orange Home UK plc is a subsidiary of France Telecom SA. Our registered office is at: Verulam Point, Station Way, St. Albans, Herts, AL1 5HE, and we are registered in England and Wales, as Company No. 3014367

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 12 13:11:51 2006