The easiest thing to do, assuming you haven't changed any .i files, is to do rm kernel/pyext/*.i modules/*/pyext/*.i svn update

That removes the .i files which were temporary files but being sloppily mixed in with input files. Sorry.