svn 命令行的使用

(1)svn 添加新文件夹 test

$ svn import ~/Desktop/test  svn://192.168.1.1/ios/test -m"add a new project"

(2)svn 删除文件夹 test

$ svn delete svn://192.168.1.1/ios/test

(3)svn 导入文件 test

$ cd ~/Desktop

$ svn checkout  svn://192.168.1.1/ios/test

(4)查找目录下的文件

$ svn  ls  svn://192.168.1.1/ios

(5)svn更新到版本 41

$ svn up -r 41 

(6)svn 冲突解释

(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               #直接进入编辑 

(mc) mine-conflict    - accept my version for all conflicts (same)    #冲突以本地为准 

(tc) theirs-conflict  - accept their version for all conflicts (same) #冲突以服务器为准