How tortoise SVN do the Merge?Help Required

I am having a task of SVN Merge. But i am not sure hows SVN perform it.

Details: we have Trunk & On Revision 99 we cut a branch called "code_2011". Two different group of developer are working one on Trunk, another on branch.

Respective developer are committing their code. Now both Trunk and branch has changed.

Now After code freeze we have Trunk on revision 200 and Branch on 299. Now we want to merge the code on Trunk.

Both repositories are clean, now i right clicked on Trunk folder and clicked merge. but i am unable to understand the terminologies start-URl & Revision then End-URL & Revision. so that i can have final code from both repository on Trunk with all revision history stuff.

Could somebody Tell me how its done. & Is it different when i merge the from Trunk to Branch.开发者_如何学运维

Thanks

---

It's not logically different when you merge from branch to trunk or vice-verse.

Follow these steps for merging code from branch to trunk (Basic merging)-

1. Checkout the working copy of the trunk (Destination, where the merge is to be done).
2. Right Click on the Trunk and select TortoiseSVN > Merge
3. select the First option "Merge a Range of revisions"
4. Select the Branch URL to merge from.
5. For Revision range to merge, click on show log. It will show you the complete change log of the branch. Select all the revision that you want to merge (Ctrl+A) for all of them and select OK.
6. In the next dialog box, select Test Merge. It will show you the Test merge results, you can check if there are any conflicts or the merge is clean.
7. Finally, Merge.

This process will merge all the branch changes in your trunk's working copy (Local checkout). You need to commit the code after that.

Also, in case of conflicts, TortoiseSVN will automatically give you option to "Edit Conflicts" to resolve them using SVN Editor or leave them so they you can manually resolve them.

Hope this helps.

Cheers!

---

Post the merge activity, you can also see the from-branch history in log.

There is an option at the bottom of show-log window: stop on copy/rename. Just deselect it, you will get to see all the affected revisions.