When I try to commit the changes of the top directory of my project in Eclipse to its sourceforge subversion repository, I get this error: Merge conflict during commit svn: Commit failed (details follow): svn: File or directory '.' is out of date; try updating svn: resource out of date; try updating.
Checking on the internet I've found some articles that was mentioning the svn:ignore property of the directory as the cause of the problem.
Let me know if I don't post the question correctly, or if I'm missing something that needs to be added in to the explanation.
The out of date error occurs whenever we try and commit our project changes.
Now the same problem happened also to other projects, after I had to change the content of the svn:ignore property to avoid that other files are sent to the repository, and to subdirectories of the original project; so avoiding to commit the top directory is not a good solution anymore. Not those files that were part of the commit have a more recent revision, simply a higher revision number. As an commit in subversion is never an update this commit takes all directories that were not part of the commit in an "out of date" state - they are no longer present in the latest revision.
I tried everything: It is not possible to send the changes of the svn:property to the repository, cleaning does help. Let me try to explain in simple words: SVN cannot merge structural changes - so if you move a file to a new localtion and somebody else does a move to a different location of the same file this will not work. Now you want to change a property in one of those directories, e.g. Try to commit: error message - which is caused by the server and not by the svn client subversive or one of its components.
Is there a solution to the problem that is not dangerous for the integrity of the subversion repository? SVNs basic idea to avoid this to allow any kind of structural change only if the directories has the "latest" revision, so it is not "out of date". If you want more information on this please just google "svn tree conflict" or read the corrosponding part of the svn manual here: short forms: Subversion will never destroy any user modification.
Well, now that is for some reasons a general rule in SVN: you cannot change (=commit) anything changed in a directory when the directory is not the latest revision. So, from time to time just press the update button and this will NOT overwrite your local changes like svn:ignore properties - and then commit!
Actually svn:ignore turns out to be different (older) on the sourceforge repository.But the proposed solution, to update the directory before commiting, does not work.