解決svn update 產生Node remains in conflict的問題

[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服務器就不會報錯了。