svn命令行使用积累

1.Node remains in conflict，

修改问价svn 提交后其他客户端svn update更新时出现以下问题

Updating '.':
Skipped 'Hi3559_Stream' -- Node remains in conflict
Skipped 'out_bg0601' -- Node remains in conflict
At revision 641.
Summary of conflicts:
Skipped paths: 2

svn cleanup后依然无效，

解决办法：

svn revert --depth=infinity    Hi3559_Stream  

svn revert --depth=infinity    out_bg0601

最后一个为冲突文件名 

轻松解决

2. local dir edit, incoming dir delete upon update

Tree conflict on '*****'
> local dir edit, incoming dir delete upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:

感觉选择哪个都会在下次更新时出问题，

解决办法

svn revert  *****(file)   -R  轻松解决！

3. svn add 且未提交前删除已经增加的  

svn revert --recursive  addfolder

4. 更换URL

 svn info  查看旧版的url 

svn switch --relocate "原svn地址" "新svn地址"

5.svn: E155010: Commit failed (details follow):
svn: E155010: '/home/**/.tmp_versions/autofs4.mod' is scheduled for addition, but is missing

svn add后commit时被删除了

处理方法：svn revert /home/**/.tmp_versions/autofs4.mod

显示 Reverted 'osdrv/opensource/kernel/linux-4.9.y/.tmp_versions/autofs4.mod'即可。

6.将多个目录移动到trunk

svn move  svn://192.168.0.252/**/*   svn://192.168.0.252/**/trunk/  -m "move to trunk"

7.新建分支

mkdir -p    ../branches/newfolder

svn cp svn://192.168.0.252/**/trunk   svn://192.168.0.252/**/branches/trunk  -m "copy a new copyer to branches"

svn mv svn://192.168.0.252/**/branches/trunk  svn://192.168.0.252/**/branches/newfolder -m ""