Re: Trouble Merging Branch Into Trunk

On Apr 13, 2007, at 10:28, Jacob wrote:

> I created a branch from a tagged revision in my trunk. So now I have:
>
> /trunk/Project/
>
> and
>
> /branches/Project-Rev555
>
> I modified the branch with a simple change, and want to merge that
> branch into the trunk.
>
>
>
> Using Tortoise, I do:
>
> From: /trunk/Project HEAD
>
> To: /branches/Project-Rev555 HEAD

[snip]

You are misunderstanding how merge works. Merge is nothing more than
diff and patch. There are three locations that need to be specified:
the two locations between which to diff, and the location to which to
apply the resulting patch. In your case, since you want to merge all
of the branch into the trunk, your three locations are:

revision 555 of branches/Project-Rev555
revision (whatever HEAD is) of branches/Project-Rev555
a working copy of trunk/Project

So the command is:

svn merge -r555:<whatever HEAD is> $URL/branches/Project-Rev555 /path/
to/workingcopy/of/trunk/Project

Then you test the working copy to make sure the change works, then
you commit it. In your commit message, be sure to note that you have
merged from revision 555 to whatever HEAD is of the Project-Rev555
branch into the trunk.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org