SVN Merge

来源:互联网 发布:网站数据统计分析 编辑:程序博客网 时间:2024/06/05 19:12

Create branch
right click the project -> svn -> branch tag.  
Fill in the URL. you can specify a new folder on the url, svn will create that folder for you automatically.
you can swich working copy to new branch or not.


Merge
After you finish developing the branch, you need merge branch back to trunk (branch).

 

Steps:
Merge trunk (SVN server) to your branch(working copy).

right click branch (working copy) -> merge, select merge type (Merge a range of revisions)(first radio button). -> Fill theURL to merge from textbox (server trunk URL).-> next -> working copy -> merge.


After that, commit your branch(working copy) to branch (SVN server).


Switch to your trunk (working copy), merge the new version branch (SVN server) to your trunk (working copy).

 

right click trunk (working copy), ->merge, select merge type (reintegrate a branch)(second radio button).-> Fill theFrom URL textbox (server branch URL) -> next -> working copy ->merge.

 

commit your trunk(working copy) to trunk (SVN server)

原创粉丝点击