A 已添加
D 已删除
U 已更新
C 合并冲突
G 合并成功
例子:
[root@ok 资料库]# svn ci -m "" Sending 资料库/简历 Transmitting file data .svn: Commit failed (details follow): svn: File '/资料库/简历' is out of date [root@ok 资料库]# svn update G 简历 Updated to revision 176. [root@ok 资料库]# svn ci -m "" Sending 资料库/简历 Transmitting file data . Committed revision 177.