A few times I've had a problem where I have made no changes to a file, but for some reason svn status says it's modified. Trying to commit it brings up the following kind of error:

Sending basshero3/model/config.py
Transmitting file data .svn: Commit failed (details follow):
svn: Checksum mismatch for '/home/jaywink/Dropbox/basshero3/basshero3/model/.svn/text-base/config.py.svn-base'; expected: '729186b4c1c81136b743d51940afd4e9', actual: '9ce432c5ab3fe8ae1827846fa093eeae'

Doing svn revert basshero3/model/config.py showed that the file on the server was indeed different - for reasons unknown (there was an extra line containing the word 'code__').

Searching Google brought up several posts that really only could tell you to backup changes in your working copy, delete the working copy, do a fresh check-out and copy back the changes.

However, it really isn't required to delete the whole working copy if this error is only related to one or a few files. I resolved this problem by copying the problematic file contents to a safe place, then doing;

svn delete --force basshero3/model/config.py
svn commit basshero3/model/config.py

After this restore the file as it should be and do;

svn add basshero3/model/config.py
svn commit basshero3/model/config.py

Problem fixed.

[ programming // tips // subversion ]