I had a similar error and fixed as follows:
(My 'fix' is based on an assumption which may or may not be correct as I don't know that much about how subversion works internally, but it definitely worked for me)
I am assuming that .svn\text-base\import.php.svn-base is expected to match the latest commit.
When I checked the file I was having the error on , the base file did NOT match the latest commit in the repository.
I copied the text from the latest commit and saved that in the .svn folder, replacing the incorrect file (made a backup copy in case my assumptions were wrong). (file was marked read only, I cleared that flag, overwrote and set it back to read only)
I was then able to commit successfully.