Geek asks and answers

How does the SVN tortoise merge? Help Wanted

I have an SVN Merge task. But I'm not sure that SVN will execute it.

More: we have Trunk and On Revision 99, we cut a branch called "code_2011". Two different development teams work on Trunk, the other on a branch.

Relevant developers execute their code. Now Trunk and the branch have changed.

Now, after freezing the code, we have Trunk on revision 200 and Branch on 299. Now we want to merge the code into Trunk.

Both repositories are clean, now I right-clicked on the Trunk folder and clicked on the merge. but I can not understand the terms start-URl and Revision, and then End-URL and Revision. so that I can have the final code from both Trunk repositories with all change history materials.

Can anyone tell me how to do this. and is it different from when I combined it from Trunk to Branch.

thank

+3
source share
2 answers

This is illogical when merging with a branch on the trunk or vice versa.

Follow these steps to merge code from branch to trunk (main merge) -

  • Make a working copy of the trunk (Destination, where the merge should be performed).
  • Right-click Trunk and select TortoiseSVN> Merge
  • select the first option " Change version range "
  • Select the Branch to join .
  • . . , (Ctrl + A) , OK.
  • Test Merge. , , - .
  • , Merge.

( ). .

, TortoiseSVN " ", SVN Editor , .

, .

!

+5

, .

show-log : stop on copy/rename. , .

+2

More articles:


All Articles