Tech Review Software Development: Tuesday, April 24, 2012

SVN Simple Merge

http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html

• Able to figure it out from this, but was not what I wanted.

Here is what I would have like to have found.

Steps to doing a simple merge from the command line.

• Make sure that both the SVN source being merge from and the source being merged to are up-to-date
• Do the following commands in both the from and the to folders.
• > svn status -u
• Should come back that everything is current
• > svn update
• Nothing should update
• The from folder doesn't need to be on the present machine if you know its URL and that it is up-to-date.
• In the to folder perform the merge command.
• This is different from a checkout command which should be done in the folder above what is being created.
• Get the URL in the from directory by doing the following command.
• > svn info
• You want the URL after "URL : "
• Using the above URL perform the following command in the to folder.
• svn merge <URL of the from>