SVN分支merge

转自：
http://blog.csdn.net/fbysss/article/details/5437157
http://www.cnblogs.com/cnblogsfans/archive/2011/02/16/1955808.html
http://tangzhifei.iteye.com/blog/1143553