☰

无法解决的 SVN 树冲突

tag-icon • tag-icon svn
无法解决的 SVN 树冲突

我在我的项目中创建了一个 Java 包的名称，现在我遇到了很多树冲突。即使我将它们标记为“正在工作”，它也不会让我提交更改。

$ svn commit CaramhellActivity.java 

Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c
Adding         CaramhellActivity.java
svn: Commit failed (details follow):
svn: File '/candy-wars/trunk/CandyWars/src/com/rifsoft/android/caramhell/CaramhellActivity.java' already exists
 svn resolve --accept 'working' CaramhellActivity.java 
$ svn commit CaramhellActivity.java 
Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c
Adding         CaramhellActivity.java
svn: Commit failed (details follow):
svn: File '/candy-wars/trunk/CandyWars/src/com/rifsoft/android/caramhell/CaramhellActivity.java' already exists
$ svn update CaramhellActivity.java    C CaramhellActivity.java
At revision 60.
Summary of conflicts:
  Tree conflicts: 1
$ svn resolve --accept 'working' CaramhellActivity.java 
Resolved conflicted state of 'CaramhellActivity.java'
$ svn commit CaramhellActivity.java 
Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c
Adding         CaramhellActivity.java
svn: Commit failed (details follow):
svn: File '/candy-wars/trunk/CandyWars/src/com/rifsoft/android/caramhell/CaramhellActivity.java' already exist

我正在使用 Linux，svn，版本 1.6.6 (r40053)。

我究竟做错了什么？

答案1

这也许是一个显而易见的建议，但是您是否已经对该目录进行了清理？

svn cleanup

如果这不起作用，这篇文章讨论了如何通过删除日志文件和其他一些内容来从其他错误中恢复 -https://stackoverflow.com/questions/158664/what-to-do-when-svn-cleanup-fails

相关内容