local unversioned, incoming add upon update问题

当update的时候遇到以下问题

 

 svn status 　　D C ~/workspace/test/a.c 　　　　> local unversioned, incoming add upon update 　　Summary of conflicts: 　　Tree conflicts:1

用以下的解决办法

① svn resolve --accept working ~/workspace/test/a.c
　　Resolved conflicted state of '~/workspace/test/a.c'
②svn revert ~/workspace/test/a.c
　　Reverted'~/workspace/test/a.c'
svn status