svn --version
svn list
下载代码:
svn checkout http://svn.server.com/svn/project_repo [--username=tom]
新建分支:
方法1:
svn copy trunk branchs/new_branch_name
svn commit -m "commit info"
方法2:
svn cp -m "create branch" http://svn_server/xxx_repository/trunk http://svn_server/xxx_repository/branches/br_feature001
删除分支:
方法1:
svn rm branchs/branch_name
svn commit -m "commit info"
方法2:
svn rm http://svn_server/xxx_repository/branches/br_feature001
分支信息:
svn info
分支切换:
svn switch branch_name (变更branch并且把当前修改合并到新branch)
分支状态:
svn status
更新分支:
svn update [filename]
变更信息:
svn diff
提交的过程:
svn add filename
svn commit -m "commit info"
撤销修改:
svn revert filename
历史信息:
svn log
解决冲突之后告知svn:
分支合并:
切换到trunk branch
svn merge 分支branch
参考:
http://blog.csdn.net/maomaoduoer/article/details/12781547
http://wiki.jikexueyuan.com/project/svn/environment-setup.html