SVN commands
1. svn merge -r @startRev:@endRev http://www.from.branch/ for different branches of merge in the local branch directory that needs to be submitted. Among them: @startRev and @endRev indicate the starting version number that needs to be merged, yes of http://www.from.branch/
2. Merge branch to trunk
Check the history of the branch that needs to be merged:
svn log --stop-on-copy -q http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo
Merge:
svn merge –r 16:HEAD http://svn .shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo