SVN 使用

1.前言

本文结合本人项目实践，介绍SVN的使用方法。

2.SVN命令

2.1  svn up

svn up -r 801622

上文代码表示将本地的svn版本更新到服务器版本801622。

2.2 svn log

https://www.wandouip.com/t5i176543/

 

3.SVN实践中的问题

3.1 svn冲突

-----------------------------------------------------------------------------------------------------------------------------------

Conflict discovered in 'test.a'.

Select: (p) postpone,

            (mf) mine-full,

            (tf) theirs-full,

            (s) show all options:

----------------------------------------------------------------------------------------------------------------------------------

此时，表明服务器中的版本和本地版本有所冲突，程序需要我们输入明确指令去选择选择哪一个版本。类似的命令列表如下。

-----------------------------------------------------------------------------------------------------------------------------------

svn detects that theres a conflict here and require you to take some kind of action.

If you type 's' here you will get a list of the commands and meaning

如果你输入s选项，则会列出所有svn解决冲突的选项，如下所示：

(e)   edit          - change merged file in an editor                         # 直接进入编辑

(df)  diff-full     - show all changes made to merged file              # 显示更改至目标文件的所有变化

(r)    resolved  - accept merged version of file

(dc) display-conflict  - show all conflicts (ignoring merged version)  #显示所有冲突

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

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

(mf) mine-full - accept my version of entire file (even non-conflicts)#完全以本地为准

(tf) theirs-full - accept their version of entire file (same)                   #完全以服务器为准

(p) postpone - mark the conflict to be resolved later                        #标记冲突，稍后解决

(l) launch - launch external tool to resolve conflict

(s) show all - show this list

-----------------------------------------------------------------------------------------------------------------------------------