[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Unable to merge my changes

From: Bob Archer <bob.archer_at_amsi.com>
Date: Thu, 5 Nov 2009 13:20:08 -0500

> I am working with Tortoise SVN. The server is SVN version is 1.2.
> The
> client is 1.4.8.
>
> I am having issue merging, in particular, I've created a branch but
> going through the usual steps (i.e. right click on trunk and then
> create a folder name in the branch folder in the same folder the
> trunk
> folder is located).
>
> Now after doing some bug fixing in trunk, I'd like to update my
> development branch.
> When I try to do so, nothing gets updated. However, when I diff the
> two versions I do see the exact files that were modified and should
> be
> merged.
>
> Some info on the way I update my development branch. I right click
> on
> the development branch, I pick the to as trunk and the from as the
> development branch. The directory I am doing it with is the
> development directory (i.e. branch/Development).
>
> Am I missing something ?
> This seems to be a trivial operation, but has been preoccupying me
> for
> the past 2 days.

Yes, you're not doing it right. If you want to merge all the changes you made in branch into the trunk you should be going FROM the first revision that contained the branch in branch TO the head of branch. If you read the svn book it explains what happens when you do a merge. The merge basically does a diff between the FROM and TO and applies that diff to the target. Once you understand that merges are much easier.

You might want to read the pre 1.5 version of the book, because 1.5 added merge tracking which doesn't exist in the versions that you are using.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2414864

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-05 19:20:51 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.