RE: Confused about how to merge changes from branch to trunk

Thanks for the reply.

If i try doing merge a range of revisions FROM trunk and do not specify a range, it appears as though it wants to re-add every file in the project even though only 20ish files have changed.

I select the revision range 155-158 it appears that it updated all the files that the other dev changed. So it looks like the first part of your suggestion worked.

Now how do i get the changes in the branch back into trunk? Do i do a tree merge and select my branch as the FROM, revision 160 (thats the revision just after i committed the updated files from the merge FROM trunk) and the head revision for trunk as the TO ?

Doing a test merge with that seems like it worked. Although it is showing one file as replaced from the previous dev - the other files the dev changed are untouched which is what i would expect since i made no changes to them.

What was really confusing me was i thought i could do all this in a single step, plus not specifying a range of revisions did not seem to work for me.

Thanks for your help

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 21:10:04 CEST