svn冲突解决方案

解决方法

步骤一、清空svn的队列

1、进入到项目的.svn目录中，查看是否存在wc.db文件

C:\Users\Administrator>D:

D:\>cd D:\BBK_SVN\I3_Trunk

D:\BBK_SVN\I3_Trunk>cd .svn

D:\BBK_SVN\I3_Trunk\.svn>dir
 Volume in drive D has no label.
 Volume Serial Number is 0005-0E52

 Directory of D:\BBK_SVN\I3_Trunk\.svn

2016/10/24  15:21                 3 entries
2016/10/24  15:21                 3 format
2016/10/24  15:22    <DIR>          pristine
2016/11/08  14:56    <DIR>          tmp
2016/11/08  14:56         2,846,720 wc.db
2016/11/08  14:56                 0 wc.db-journal
               4 File(s)      2,846,726 bytes
               2 Dir(s)  55,646,486,528 bytes free

• 

2、执行sqlite3命令查看wc.db数据库的内容

C:\Users\Administrator>D:

D:\>cd D:\BBK_SVN\I3_Trunk

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "select * from work_queue"
3685|(file-install sync/maven_pom.properties 1 0 1 1)
3686|(file-install sync/src/main/aidl/com/xtc/sync/IConnectionService.aidl 1 0 1 1)
3687|(file-install sync/src/main/aidl/com/xtc/sync/IReadDataCallback.aidl 1 0 1 1)

• 1

通过sqlite3命令可以看到wc.db中的work_queue表中有多条数据。

3、清空work_queue表数据，然后查看是否清楚完毕

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "select * from work_queue"
3685|(file-install sync/maven_pom.properties 1 0 1 1)
3686|(file-install sync/src/main/aidl/com/xtc/sync/IConnectionService.aidl 1 0 1 1)
3687|(file-install sync/src/main/aidl/com/xtc/sync/IReadDataCallback.aidl 1 0 1 1)

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "delete from work_queue"

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "select * from work_queue"

• 

上面的所有命令如下所示：

Microsoft Windows [Version 6.1.7601]
Copyright (c) 2009 Microsoft Corporation.  All rights reserved.

C:\Users\Administrator>D:

D:\>cd D:\BBK_SVN\I3_Trunk

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "select * from work_queue"
3685|(file-install sync/maven_pom.properties 1 0 1 1)
3686|(file-install sync/src/main/aidl/com/xtc/sync/IConnectionService.aidl 1 0 1 1)
3687|(file-install sync/src/main/aidl/com/xtc/sync/IReadDataCallback.aidl 1 0 1 1)

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "delete from work_queue"

D:\BBK_SVN\I3_Trunk>sqlite3 .svn/wc.db "select * from work_queue"

D:\BBK_SVN\I3_Trunk>

• 

4、清空wc_lock表数据

有时候只是清空work_queue表数据不行，还得清空wc_lock表数据，才能cleanup成功

D:\BBK_SVN\I3_Trunk\.svn>sqlite3 wc.db "delete from wc_lock"

• 1