Svn
Download as PPTX, PDF0 likes277 views
Subversion（svn）是一个集中式的信息共享系统，其核心是版本库，允许客户端连接以读取和修改数据。文档描述了svn的基本操作，如更新、提交更改、处理冲突和分支合并，并提供了一些常用命令。注意事项包括文件命名规则及合并后的分支使用限制。
Svn
- 1. SVN
- 4. 2.实践更新你的工作拷贝。svn updateMake changes.svn addsvn deletesvn copysvn moveExamine your changes.svn statussvn diffPossibly undo some changes.svn revertResolve conflicts (merge others' changes).svn updatesvn resolveCommit your changes.svn commit
- 6. 4.需要解决的问题
- 8. 6.合并(p) postpone - mark the conflict to be resolved later(df) diff-full - show all changes made to merged file (e) edit - change merged file in an editor(r) resolved - accept merged version of file (mf) mine-full - accept my version of entire file (ignore their changes) (tf) theirs-full - accept their version of entire file (lose my changes) (l) launch - launch external tool to resolve conflict (h) help - show this list
- 9. 7.命令svn cp http://trunkhttp://branches/... –m “xxx”svn co http://branches/... Dirsvnswhttp://branches/...
- 10. 8.问题分支的升级svn cp 新分支svnsw新分支svn merge –r1:10 原分支注意不得有中文文件名不得带有除’_/-’下划线中划线以外的符号已合并的分支不得继续使用