Re: noob question-- how to replace the trunk with a branch?

On Oct 8, 2007, at 19:46, Reuben Avery wrote:

> yeah, newbie question here: so I have a branch that we've been
> working on and I'd like to now deploy all these changes into the
> trunk and do away with the branch. would I do this with an svn
> merge or with a copy? and how would the command look?
>
> this is what I'm currently thinking but I am hesitant to pull the
> trigger:
>
> svn merge http://repo/svn/project/trunk http://repo/svn/project/
> branches/mybranch project_working_copy
>
> (project_working_copy is a working copy of project/branches/mybranch)

project_working_copy should be a working copy of the trunk, not the
branch, if you're intending to merge the changes into the trunk.

Have there been any changes at all to the trunk since the time when
the branch was created? If so, your proposed merge command is
probably not what you want, as it will undo all those changes.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 9 03:07:11 2007