在linux下维护代码的时候,SVN 出现了如下的问题:
abc$ svn st
D C usr/local/lib/libxxxxx.so
> local unversioned, incoming file add upon update
Summary of conflicts:
Tree conflicts: 1abc$ svn resolve --accept working usr/local/lib/libxxxx.so
Resolved conflicted state of 'usr/local/lib/libxxxx.so'abc$ svn st
D usr/local/lib/libxxxx.so
abc$ ls usr/local/lib/libxxxx.so
usr/local/lib/libxxxx.so
abc$ svn revert usr/local/lib/libxxxx.so
Reverted 'usr/local/lib/libxxxx.so'
svn冲突解决, svn log依然还在