-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2007b@ryandesign.com]
Sent: Monday, October 08, 2007 6:05 PM
To: Reuben Avery
Cc: subversion-users
Subject: 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.
Typically you should create a start point for your branch (for e.g.
start_tag)when you created the branch mybranch from the trunk, then with
this tag tags/start_tag as the start point create a branch
branches/mybranch. When you are ready to merge changes on this branch to
the trunk create tag merge point on the branch
(mybranch_merge_1_to_trunk)
1/ checkout trunk
2/ cd to workspace checked out above
3/ svn merge
http://repo/svn/project/{tags/start_tag,tags/mybranch_merge_1_to_trunk}
Hope this helps.
Regards,
Rajesh
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 9 05:33:32 2007