下面是在eclipse下使用subeclipse插件详细使用过程:
首先建立一个工程,名字叫Facebook
1.建立分支,为新的分支指定访问URL:Facebook3[注释不要忘了]
![](http://dl.iteye.com/upload/attachment/165734/e1e3230b-b8d7-342a-b876-df3cf9fd37d4.jpg)
![](http://dl.iteye.com/upload/attachment/165736/14c7ed56-b067-3fbb-a334-df64f9f14909.jpg)
![](http://dl.iteye.com/upload/attachment/165738/d638badf-6495-323e-8c1c-9523c2b57fb4.jpg)
2.建立好分之后,使用“切换”功能切换到分支下进行开发。
![](http://dl.iteye.com/upload/attachment/165740/d69c8935-42f9-308f-b9ac-66705eec5d8d.jpg)
![](http://dl.iteye.com/upload/attachment/165742/2728a99a-da56-3c21-9133-f8ca234b2ddb.jpg)
我新建了一个FB3.html的文件并在分支下进行提交。
![](http://dl.iteye.com/upload/attachment/165744/779bd7bd-d5d2-3ce7-ac11-1d585e06addb.jpg)
![](http://dl.iteye.com/upload/attachment/165747/5d98cffa-f531-3276-8c41-46514e6fa064.jpg)
3.切换回trunk版【即URL为Facebook的版本】
![](http://dl.iteye.com/upload/attachment/165750/2825a3df-7cbd-3656-97b7-c33f4a936670.jpg)
你会发现trunk版里并没有出现我们刚刚提交的FB3.html,因为FB3.html是属于分支的,接下来我们要做的就是“合并”,通过合并,我们可以将分支下进行的更改合并到trunk版里。
![](http://dl.iteye.com/upload/attachment/165752/186a04fe-acdf-328a-85ae-1af6884c805e.jpg)
![](http://dl.iteye.com/upload/attachment/165754/17f41fcf-5c7b-3225-9b45-e3cd35723b2a.jpg)
下面是合并的主要配置:
起始路径:trunk版的路径【若需要把trunk版的改动合并到分支则相反】
目标路径:从哪里获取改动【这里是分支路径】
你可以使用指定的版本号,这里采用最新修订版。
![](http://dl.iteye.com/upload/attachment/165756/c069cc72-88ff-30d5-b134-4de364d5b5e7.jpg)
4.点击合并,你会发现trunk版下新增了一个文件FB3.html
这样我们就将分支下所做的改动合并到了trunk版里。
![](http://dl.iteye.com/upload/attachment/165758/1182f818-c7ae-31c4-b898-272a3d6fb531.jpg)
值得注意的是:
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
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
其他参考资料:
http://www.iteye.com/wiki/subclipse/1626-subclipse-getting-started-guide-and-reference-c
===========================关于合并==========================
我在合并的时候发现,合并后文件被直接覆盖掉了,而没有出现本该出现的【冲突】,后来经过仔细研究发现,是操作问题。
![](http://dl.iteye.com/upload/attachment/165911/260aa46c-e184-3b93-a2de-373095ced812.jpg)
假设我原来的项目是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.
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.
3.目标路径:这里使用起始路径。
4.目标版本号:使用最新版即 HEAD.
点击合并,如果有人在主干线版本上做了更改,而你再分支上也对这个文件作了更改,将会产生冲突。然后手动把冲突的代码合并一下,右键-标记为解决,这就达到我们的目的了。