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.
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.
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.
I tried everything:
It is not possible to send the changes of the svn:property to the
repository, cleaning does help.
Is there a solution to the problem that is not dangerous for the integrity
of the subversion repository?