svn 命令行提示：local edit, incoming delete upon update的解决办法

转自：http://www.huilinwang.com/blog/post/405.html

svn local delete, incoming delete upon update 解决办法

# 1.In your working directory, recreate that conflicting file:
$ touch foo
# 2.Revert that file to the state SVN likes (that means deleted):
$ svn revert foo
# 3.Now delete that file:
$ rm foo
# 4.Conflict resolved:
$ svn st
# Done.