Sunday, June 22, 2014

SVN Merge into trunk from development branch

Make sure you are in the trunk when merging. Then right click on your SVN project Team->Merge and fill form like this:

Merging to trunk as destination and branch br2 as development branch



Files from branch br2 will be transferred to trunk. After merging new files are in your working copy so you must commit newly added files to your remote repo.

merge --depth=infinity https://xp-dev.com/svn/qwef/trunk@HEAD https://xp-dev.com/svn/qwef/branches/br2@HEAD C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/atrunk
    --- Merging differences between repository URLs into C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/atrunk
    A  C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/atrunk/docs/num4.txt
     G C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/atrunk
    Merge complete.
    ===== File Statistics: =====
    Added: 1
    ==== Property Statistics: =====
    Merged: 1
commit -m "added num4.txt" C:/Users/yourUserName/Documents/Aptana Studio 3 Workspace/atrunk/docs/num4.txt
    Adding         Documents/Aptana Studio 3 Workspace/atrunk/docs/num4.txt
    Committed revision 75.

And this is the output created in console in Eclipse

No comments: