【svn】svn常用命令

删除.svn文件
cd /xxx
find . -type d -name ".svn"|xargs rm -rf

 

导出代码到当前路径

svn co svn://xxxx

 

合并

svn merge -r 2662:2929 svn://192.168.8.100/NVR/Project/mshn/branches/branches-x.8.0.5

2662 起始revision号，2929结束revision号

logs：merge from branches/branches-x.8.0.5(r 2662:2929)

 

回退版本 (4286反向同步到4217)
svn merge -r 4286:4217 svn://192.168.8.100/NVR/Project/mshn/trunk/msapp-x.9.0.x

从主干复制到tags

svn copy svn://192.168.8.100/NVR/Project/mshn/trunk/msapp svn://192.168.8.100/NVR/Project/mshn/tags/release-8.0.5 -m 'Create mshn release-8.0.5.'

 

树冲突解决办法：
查看冲突 ：svn st | grep '!'
解决冲突：svn resolve --accept working 冲突路径

 

同步代码解决冲突问题

选推迟，修改后用命令解决冲突
svn resolved ./src/web/webserver/util.c

svn resolved -R ./*

删除文件
svn delete svn://192.168.8.100/NVR/Project/mshn/trunk/msapp-x.9.0.x/tools/QTLibs -m “删除QTLibs”
svn delete svn://192.168.8.100/NVR/Project/mshn/trunk/msapp-x.9.0.x/tools/hi3798/QTLibs -m “删除QTLibs”

 

linux 下载kdesvn