svn常用命令與分支操作

 svn基本使用

1． 創建版本庫：

Svnadmin create repos

Svnadmin create repos

2． 修改配置文件
Auth文件   

[groups]
admin=shguo
[/]
@admin=rw
*=r

[groups]
admin=shguo
[/]
@admin=rw
*=r

Passwd文件

[users]
shguo=shguo

[users]
shguo=shguo

Svnserve.conf文件

anon-access = read
auth-access = write
password-db = passwd
authz-db = authz

anon-access = read
auth-access = write
password-db = passwd
authz-db = authz

注意：要去掉前面的空格不然會報，認證配置失敗
3. 啓動：

svnserve –d –r repos

svnserve –d –r repos

4. 創建目錄

Svn mkdir svn://127.0.0.1/repos/ -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/  -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/trunk  -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/branches -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/tags  -m “mkdir”

Svn mkdir svn://127.0.0.1/repos/ -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/  -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/trunk  -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/branches -m “mkdir”
Svn mkdir svn://127.0.0.1/repos/sns/tags  -m “mkdir”

5. 導入項目：

Svn import sns svn://127.0.0.1/repos/sns/trunk/ –m “init project”
查看：svn list svn://127.0.0.1/repos/sns/trunk/

Svn import sns svn://127.0.0.1/repos/sns/trunk/ –m “init project”
查看：svn list svn://127.0.0.1/repos/sns/trunk/

6. 導出項目開發：

Svn checkout svn://127.0.0.1/repos/sns/trunk/ sns

Svn checkout svn://127.0.0.1/repos/sns/trunk/ sns

7. 進入目錄就可以進行開發操作了

Cd sns
Svn status
Svn add  new.txt
Svn commit –m ‘commit’

Cd sns
Svn status
Svn add  new.txt
Svn commit –m ‘commit’

Svn log new.txt
其它一些命令：

Svn update
Svn diff –r m:n path
Svn lock some.java or svn unlock some.java
Svn revert
Svn add /delete / copy / move
Svn switch –relocate svn://xxxx/one   svn://xxxx/two
Svn list path

Svn update 
Svn diff –r m:n path
Svn lock some.java or svn unlock some.java
Svn revert 
Svn add /delete / copy / move
Svn switch –relocate svn://xxxx/one   svn://xxxx/two
Svn list path

Svn中分支的使用
1． 創建分支

Svn cp
http://svn.shguo.com/repos/sns/trunk/  http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo
 -m “shguo_branch”

Svn cp 
http://svn.shguo.com/repos/sns/trunk/  http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo
 -m “shguo_branch”

也可以通過 TortoiseSVN 中的Branch/tag來創建分支

2． 取出分支來開發

Svn co
http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo
101128_sns_imageUpload_shguo

Svn co 
http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo 
101128_sns_imageUpload_shguo

3． 開發完成後向主幹提交

檢查需要合併的分支的歷史:

http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo

svn log --stop-on-copy -q 
http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo

合併：

16:HEAD
http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo

svn merge –r
16:HEAD 
http://svn.shguo.com/repos/sns/branches/101128_sns_imageUpload_shguo

檢查衝突：
svn status
如果有解決衝突，沒有就svn commit命令就可以完成提交
====2011.04.10
1. 批量增加svn文件

svn add `svn st |grep ? |awk '{print $2}'`
svn st |grep ? |awk '{print $2}' |xargs svn add

svn add `svn st |grep ? |awk '{print $2}'`
svn st |grep ? |awk '{print $2}' |xargs svn add

2. 批量增加svn:ignore屬性

Java代碼

svn propset svn:ignore  -F ~/.svnignore -R /app/work/app1

感覺複製過來效果不好樣，貼個出處：http://yidianfengfan.iteye.com/blog/829713 覺得有用，看不太清楚的可以去這裏看。