[root@localhost svnrepos]# svn up .
Updating '.':
Skipped 'pythonresource.txt' -- Node remains in conflict
At revision 14.
Summary of conflicts:
Skipped paths: 1

解决办法是：
[root@localhost svnrepos]svn revert --depth=infinity pythonresource.txt
Reverted 'pythonresource.txt'
[root@localhost svnrepos] svn up .
Reverted 'pythonresource.txt'

再次在本地编辑pythonresource.txt,commit后，到web服务器里，svn up pythonresource.txt ,一切正常。

或者在本地copy pythonresource.txt到其他目录，commit ，然后copy pythonresource.txt 到原来的目录,再次commit 后。在http服务器就不会报错了。