On Oct 26, 2007, at 15:31, Fournier,Danny [NCR] wrote:
> Basically, I have been working on branch adding new features. Now I
> find
> myself with an obsolete trunk. The code is old and much changes have
> been made. We're talking several months of work done on the branch
> now.
>
> I feel comfortable using the branch as the new trunk without merging.
> Just wondering how I would go about doing that? Delete all files from
> trunk, commit, copy files from branch and commit? Or should I nuke the
> repository and restart by importing the exported branch files?
You could do this: If there are any changes made to the trunk that
have not made it into the branch yet, merge those changes to the
branch. Then, "svn rm TRUNKURL" and "svn mv BRANCHURL TRUNKURL". Then
everyone with a working copy of the old trunk should delete it and
check out the new trunk. And anyone with a working copy of the old
branch should "svn switch TRUNKURL WC".
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 26 22:39:55 2007