svn cleanup失败，显示Working Copy……

来源：互联网发布：java静态网页编辑：程序博客网时间：2024/04/30 22:16

产生这种情况大多是上次svn命令执行失败且被锁定了，可能是本地更新时，操作中断或者本身空间原因而造成更新失败被锁定。

更新失败时可以用svn cleanup命令来清除锁定。

如果cleanup没有效果的话只好手动删除锁定文件。 cd 到svn项目目录下，

然后执行如下命令：del lock /q/s 来清除锁定。

当本地文件与服务器文件有冲突时会出现如下选择

Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options:
各个选项的意思分别是：
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

0 0