Replacing trunk

jackk100 · Post by **jackk100** » Thu Dec 07, 2006 4:53 pm

I have a branch that has recieved a lot of work and the trunk has not been touched. I would like to completely replace the trunk with the branch. Is there a way to do that, other than to check out the trunk and replace each local file with the branch file and then check in the trunk? I would like to retain the branch file's histories in the trunk (not required, but would be nice) and also want to remove any files in trunk that are no longer in branch, so tht the new trunk is clean.

TIA,
Jack

lbauer · Post by **lbauer** » Thu Dec 07, 2006 5:30 pm

You could use Vault's Merge Branches wizard (under the Tools menu) to merge the changes from the Branch into the trunk. It doesn't exactly bring in the history, but creates new history as it recreates transactions from the branch into the trunk.

This will take care of deletes in the trunk, too. At the end of the merge, the contents of the two folders should be essentially the same. You can delete the branch after that.