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

> As Ben said, did you use TSVN Copy/Branch to create your branch path? Or, did you just copy the trunk locally and then import/add it to the repo? If the latter you lost your ancestry info.

I think i answered him - i created the branch using TSVN using the branch/tag option.

> Yes, you have to have a working copy of the trunk, since that will be your merge target. You right click on your trunk working copy, and merge selecting the branch as the "FROM Url".

Ah - i do not have a copy of the trunk checked out. That seems kind of silly to me that I need to check out a whole other copy of the project just so i can merge in the changes. I assumed i could do all this directly within SVN itself rather then having to keep multiple copies of the project on my drive.

Is this a limitation with SVN itself? Or just how TSVN works?

Thanks for the help - i'll go check out a copy of the trunk and see if i can finally get this all sorted out.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 23:52:11 CEST