SVN Merge

Create Tag:
Before creating the tag, please confirm that developers don't commit any new code. Please create a tag based on where code is changed.
* From Trunk
svn copy -r <revision_id> http://svn.xxx.com/app/trunk                     http://svn.xxx.com/app/tags/TagName -m " Mention the fixed bug ids here"
* From Branch
svn copy -r <revision_id> http://svn.xxx.com/app/Branch/<Branch_Name>
http://svn.xxx.com/app/tags/TagName -m " Mention the fixed bug ids here"

Note: 创建分支的命令同上 只是目标地址不一样
Merge from branch:

#  Download the trunk code into a local folder

]$ svn co http://svn.cnet.com/ebs/offline/webapps/CorporateDirectory/trunk CorporateDirectory

# Merge the branch code to the trunk

$] svn merge -r <branch_from>:<branch_to> http://svn.xxx.com/app/branches/BRANCH-NAME

#Commit the changes into the trunk

你可能感兴趣的:(SVN)