SVN使用教程之——分支、合并

 

首先说下为什么我们需要用到分支-合并。比如项目demo下有两个小组,svn下有一个trunk版。由于客户需求突然变化,导致项目需要做较大改动,此时项目组决定由小组1继续完成原来正进行到一半的工作【某个模块】,小组2进行新需求的开发。那么此时,我们就可以为小组2建立一个分支,分支其实就是trunk版【主干线】的一个copy版,不过分支也是具有版本控制功能的,而且是和主干线相互独立的,当然,到最后我们可以通过【合并】功能,将分支合并到trunk上来,从而最后合并为一个项目。

下面是在eclipse下使用subeclipse插件详细使用过程: 
首先建立一个工程,名字叫Facebook 
1.建立分支,为新的分支指定访问URL:Facebook3[注释不要忘了] 
id="iframe_0.8392156063829457" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165734/e1e3230b-b8d7-342a-b876-df3cf9fd37d4.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.8392156063829457',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 513px; height: 354px;">

id="iframe_0.4956395485717153" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165736/14c7ed56-b067-3fbb-a334-df64f9f14909.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.4956395485717153',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 582px; height: 484px;">

id="iframe_0.14562362252183103" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165738/d638badf-6495-323e-8c1c-9523c2b57fb4.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.14562362252183103',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 666px; height: 266px;">

2.建立好分之后,使用“切换”功能切换到分支下进行开发。 
id="iframe_0.7365018815426929" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165740/d69c8935-42f9-308f-b9ac-66705eec5d8d.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.7365018815426929',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 482px; height: 302px;">

id="iframe_0.47082848773540364" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165742/2728a99a-da56-3c21-9133-f8ca234b2ddb.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.47082848773540364',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 643px; height: 557px;">
我新建了一个FB3.html的文件并在分支下进行提交。 
id="iframe_0.9442077688733714" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165744/779bd7bd-d5d2-3ce7-ac11-1d585e06addb.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.9442077688733714',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 349px; height: 193px;">

id="iframe_0.3831145738119768" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165747/5d98cffa-f531-3276-8c41-46514e6fa064.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.3831145738119768',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 577px; height: 438px;">

3.切换回trunk版【即URL为Facebook的版本】 
id="iframe_0.8094580626078625" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165750/2825a3df-7cbd-3656-97b7-c33f4a936670.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.8094580626078625',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 612px; height: 193px;">
你会发现trunk版里并没有出现我们刚刚提交的FB3.html,因为FB3.html是属于分支的,接下来我们要做的就是“合并”,通过合并,我们可以将分支下进行的更改合并到trunk版里。
id="iframe_0.0964779344834592" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165752/186a04fe-acdf-328a-85ae-1af6884c805e.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.0964779344834592',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 293px; height: 181px;">

id="iframe_0.11924639874621512" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165754/17f41fcf-5c7b-3225-9b45-e3cd35723b2a.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.11924639874621512',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 463px; height: 325px;">

下面是合并的主要配置: 
起始路径:trunk版的路径【若需要把trunk版的改动合并到分支则相反】 
目标路径:从哪里获取改动【这里是分支路径】 
你可以使用指定的版本号,这里采用最新修订版。 

id="iframe_0.9376397034301904" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165756/c069cc72-88ff-30d5-b134-4de364d5b5e7.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.9376397034301904',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 566px; height: 470px;">

4.点击合并,你会发现trunk版下新增了一个文件FB3.html 
这样我们就将分支下所做的改动合并到了trunk版里。 
id="iframe_0.9972418329356143" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165758/1182f818-c7ae-31c4-b898-272a3d6fb531.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.9972418329356143',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 473px; height: 85px;">

值得注意的是: 
1.在建立分支的时候最好添加注释。 
2.进行合并前最好保证两个版本都是干净的【即没有未提交或者冲突的文件存在】 
3.合并时的目标路径:需要把谁的改动合并到其他版本就填谁的URL。 


整个过程的SVN命令行输出如下: 
  1. copy -rHEAD svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook3   
  2. propset subclipse:tags "1538,Facebook2,/Facebook2,branch   
  3. 1540,Facebook3,/Facebook3,branch" E:/myeclipse/workspace/Facebook   
  4. switch svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook3 E:/myeclipse/workspace/Facebook -rHEAD   
  5.     At revision 1541.   
  6. add -N E:\myeclipse\workspace\Facebook\WebRoot\FB3.html   
  7.     A         E:/myeclipse/workspace/Facebook/WebRoot/FB3.html   
  8. commit -m "" E:/myeclipse/workspace/Facebook/WebRoot/FB3.html   
  9.     Adding         E:/myeclipse/workspace/Facebook/WebRoot/FB3.html   
  10.     Transmitting file data ...   
  11.     Committed revision 1542.   
  12. switch svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook E:/myeclipse/workspace/Facebook -rHEAD   
  13.     D  E:/myeclipse/workspace/Facebook/WebRoot/FB3.html   
  14.     Updated to revision 1542.  
  15.     ===== File Statistics: =====   
  16.     Deleted: 1   
  17. merge svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook@HEAD svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook3@HEAD E:/myeclipse/workspace/Facebook   
  18.     A  E:/myeclipse/workspace/Facebook/WebRoot/FB3.html   
  19.     Merge complete.  
  20.     ===== File Statistics: =====   
  21.     Added: 1  
  1. <span style="font-size:12px;">copy -rHEAD svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook3  
  2. propset subclipse:tags "1538,Facebook2,/Facebook2,branch  
  3. 1540,Facebook3,/Facebook3,branch" E:/myeclipse/workspace/Facebook  
  4. switch svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook3 E:/myeclipse/workspace/Facebook -rHEAD  
  5.     At revision 1541.  
  6. add -N E:\myeclipse\workspace\Facebook\WebRoot\FB3.html  
  7.     A         E:/myeclipse/workspace/Facebook/WebRoot/FB3.html  
  8. commit -m "" E:/myeclipse/workspace/Facebook/WebRoot/FB3.html  
  9.     Adding         E:/myeclipse/workspace/Facebook/WebRoot/FB3.html  
  10.     Transmitting file data ...  
  11.     Committed revision 1542.  
  12. switch svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook E:/myeclipse/workspace/Facebook -rHEAD  
  13.     D  E:/myeclipse/workspace/Facebook/WebRoot/FB3.html  
  14.     Updated to revision 1542.  
  15.     ===== File Statistics: =====  
  16.     Deleted: 1  
  17. merge svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook@HEAD svn://192.168.1.192/placii/staggingarea/xiangqi/Facebook3@HEAD E:/myeclipse/workspace/Facebook  
  18.     A  E:/myeclipse/workspace/Facebook/WebRoot/FB3.html  
  19.     Merge complete.  
  20.     ===== File Statistics: =====  
  21.     Added: 1  
  22. </span>  


希望本文能有所帮助。 
其他参考资料: 
http://www.iteye.com/wiki/subclipse/1626-subclipse-getting-started-guide-and-reference-c



===========================关于合并========================== 
我在合并的时候发现,合并后文件被直接覆盖掉了,而没有出现本该出现的【冲突】,后来经过仔细研究发现,是操作问题。 

id="iframe_0.6607652198981879" src="data:text/html;charset=utf8,%3Cimg%20id=%22img%22%20src=%22http://dl.iteye.com/upload/attachment/165911/260aa46c-e184-3b93-a2de-373095ced812.jpg?_=2586853%22%20style=%22border:none;max-width:1200px%22%3E%3Cscript%3Ewindow.onload%20=%20function%20()%20%7Bvar%20img%20=%20document.getElementById('img');%20window.parent.postMessage(%7BiframeId:'iframe_0.6607652198981879',width:img.width,height:img.height%7D,%20'http://www.cnblogs.com');%7D%3C/script%3E" frameborder="0" scrolling="no" style="margin: 0px; padding: 0px; border-width: initial; border-style: none; width: 563px; height: 467px;">
假设我原来的项目是placii,建立了一个分支是placiiStore.现在需要将分支placiiStore合并到主干线上。那配置应该如图所示 
1.【起始路径】:这里需要填分支的路径。 
2.第一个修订号:建立分支时的版本号。在建立分支时候记录下svn的console 
我的是
  1. copy -rHEAD svn://192.168.1.192/placii/trunk/code/server/source%20code/placii svn://192.168.1.192/placii/trunk/code/server/source%20code/placiiStore   
  2. propset subclipse:tags "1527,placiiStore,/source code/placiiStore,branch   
  3. 1549,placiiStore,/source%20code/placiiStore,branch" E:/myeclipse/workspace/placii   
  4. switch svn://192.168.1.192/placii/trunk/code/server/source code/placiiStore E:/myeclipse/workspace/placii -rHEAD   
  5.     At revision 1550.  
  1. <span style="font-size:12px;">copy -rHEAD svn://192.168.1.192/placii/trunk/code/server/source%20code/placii svn://192.168.1.192/placii/trunk/code/server/source%20code/placiiStore  
  2. propset subclipse:tags "1527,placiiStore,/source code/placiiStore,branch  
  3. 1549,placiiStore,/source%20code/placiiStore,branch" E:/myeclipse/workspace/placii  
  4. switch svn://192.168.1.192/placii/trunk/code/server/source code/placiiStore E:/myeclipse/workspace/placii -rHEAD  
  5.     At revision 1550.</span>  

3.目标路径:这里使用起始路径。 
4.目标版本号:使用最新版即 HEAD. 

点击合并,如果有人在主干线版本上做了更改,而你再分支上也对这个文件作了更改,将会产生冲突。然后手动把冲突的代码合并一下,右键-标记为解决,这就达到我们的目的了。
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值