svn: E155011 "out of date" error and svn: E160020 "already exists" error

I renamed a package (folder name) and then renamed two files under it (the renamed folder). Then I use kdesvn to do commit which will add and then commit, I think. I got the attached error.  Then I tried the following command line commands but no luck: svn up --force theFolder, svn commit -m "messages"
.Is there a way to fix it or I have to checkout a fresh copy and copy over the existing one?

I am using svn 1.8.10 under Fedora 20.

thanks,James

$ svn commit -m "rename scmgmt package to exmgmt"
Adding         com/uiapp/exmgmt/ExMgmtMgr.java
svn: E155011: Commit failed (details follow):
svn: E155011: File '/home//0-workspace/OC/trunk/latest/src/com/uiapp/exmgmt/ExMgmtMgr.java' is out of date
svn: E160020: File 'com/uiapp/exmgmt/ExMgmtMgr.java' already exists
Received on 2015-02-19 17:56:24 CET