Confused about how to merge changes from branch to trunk

Posted a question about this on stackoverflow but the advice i've been given there doesn't seem to be working as i think it should when i do a test merge.

http://stackoverflow.com/questions/18970598/tortoisesvn-merging-a-branch-to-trunk

In a nut shell this is my situation.

Have a project where there was just the trunk. My working copy was on trunk. I made a new branch and switched my working copy to that branch. Since doing that i've made some code changes i want to copy back into branch before i do anything further. Another dev has also checked in some code changes into trunk as well. We have NOT worked on the same files so there should be no conflicts or need to merge differences between files.

revision numbers

153 is the creation of the branch
154 is some code i checked into the branch
155-158 is the code the other dev checked into trunk
159 another change i checked into branch

On stackoverflow i was told to merge a range of revisions without selecting a range and merging FROM the branch. When i do this though it appears to be re-adding every file in the project. even though between all those revisions maybe 20 files were changed.

What i want to do is take revisions 154 and 159 and move those into the trunk. I'd also like take revisions 155-158 and merge those into the branch. Although i dont really need those files - as long as they don't get over-written when i am finished working on the branch and merge everything back into trunk, then those files can probably stay in trunk. But i'd rather get everything as synced up as possible.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 20:14:39 CEST