Using the command line to merge, learn to use this method without relying on other tools.

Using the command line to merge, learn to use this method without relying on other tools.
To illustrate:
Now there are project projects as follows:
Http://svn.com/svn/test/trunk
On this day in 2013-08-30 a branch dev-130830-configurationcenter out from the trunk, as follows:
Http://svn.com/svn/test/branches/dev-130830-configurationCenter
Then there are code changes on the trunk and Dev-130830-configurationcenter, and now to merge the branch back into the trunk, the following steps are required:
1, the trunk is first merge to the branch, the purpose is to let the trunk changes on the branch
Note: The local project version is the version on the branch
1.1 CD-Local engineering catalogue
1.2 svn up.
1.3 svn merge Http://svn.com/svn/test//trunk.
1.4 Then submit the merge code to the branch SVN
2. Switch the local project from the version on the branch to the trunk version
2.1 CD-Local engineering catalogue
2.1 SVN switch http://svn.com/svn/test/trunk. -R HEAD--force
3, merge the branch into trunk
3.1 CD-Local engineering catalogue
3.2 svn up.
3.3 svn merge Http://svn.com/svn/test/branches/dev-130830-configurationCenter.
3.4 Then submit the merge code to the trunk svn.

Using the command line to merge, learn to use this method without relying on other tools.