svn常用命令与分支操作

[b]svn基本使用[/b]

[b]1． 创建版本库：[/b]

Svnadmin create repos

[b]2． 修改配置文件[/b]
[b]Auth文件 [/b]

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

[b]Passwd文件[/b]

[users]
shguo=shguo

[b]Svnserve.conf文件[/b]

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

[b][color=red]注意：要去掉前面的空格不然会报，认证配置失败[/color][/b]
[b]3. 启动：[/b]

svnserve –d –r repos

[b]4. 创建目录[/b]

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”

[b]5. 导入项目：[/b]

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

[b]6. 导出项目开发：[/b]

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

[b]7. 进入目录就可以进行开发操作了[/b]

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

Svn log new.txt
[b]其它一些命令：[/b]

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

[b]Svn中分支的使用[/b]
[b]1． 创建分支[/b]

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来创建分支

[b]2． 取出分支来开发[/b]

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

[b]3． 开发完成后向主干提交[/b]

检查需要合并的分支的历史:

svn log --stop-on-copy -q 
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命令就可以完成提交
[color=red]====2011.04.10[/color]
1. 批量增加svn文件

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

2. 批量增加svn:ignore属性

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