Super User is a question and answer site for computer enthusiasts and power users. Join them; it only takes a minute:

Sign up
Here's how it works:
  1. Anybody can ask a question
  2. Anybody can answer
  3. The best answers are voted up and rise to the top

I created the name of a Java package in my project and now I'm getting a lot of Tree Conflicts. Even if I mark them as "working", it doesn't let me commit the changes.

$ 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

I'm using Linux, svn, version 1.6.6 (r40053).

What am I doing wrong?

share|improve this question
up vote 1 down vote accepted

This maybe an obvious suggestion, but did you already run a clean up on that directory?

svn cleanup

If that doesn't work, this post discusses how to recover from a different error by deleting the log files and some other stuff - http://stackoverflow.com/questions/158664/what-to-do-when-svn-cleanup-fails

share|improve this answer
    
Yes, the cleanup did nothing. Gonna check that link. – m0skit0 Feb 10 '12 at 19:17
1  
Most voted from that link worked fine. Also I diretcly used svn from console to do all the stuff, and not the AWFUL tool included in Eclipse Indigo. – m0skit0 Feb 10 '12 at 19:43

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .