How to cut and graft?

In a project, we originally created a branch because we need to create
a system which was basically a variation of the original project and
share the common unchanged code with the trunk.

Since then, the trunk has now gone into end of life and so I want cut
the trunk off at the branch point and cut and graft the branch into
the trunk without losing any of the version history that has occurred
after the branch and keep it's linage intact.

How do I do that?

Chris

--
Chris Velevitch
Manager - Adobe Platform Users Group, Sydney
m: 0415 469 095
www.apugs.org.au
Adobe Platform Users Group, Sydney
July 2010: Developing applications on Brightcove's Online Video platform
Date: 26h July 6pm for 6:30 start
Details and RSVP at
http://apugs.groups.adobe.com/index.cfm?event=post.display&postid=28912.