(1) 导入数据到版本库
svn import (copy an unversioned tree of files into a repository)
(2) 初始化检出
svn co (checkout)
(3) 更新工作拷贝
svn up (update)
(4) 做出修改
svn add/delete/copy/move
(5) 检验修改
svn status/diff
(6) 取消修改
svn revert
(7) 解决冲突
svn up (update)
conflict options:
(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) their-full, accept their version of entire file(lose my changes)
(l) launch, launch external tool to reslove conflict
(h) help
svn resolve
–accept ARG(base, working, mine-conflict, theirs-conflict, mine-full, theirs-full)
(8) 提交修改
svn commit
(9) 检验历史
svn log
sv