SVN常用指令

常用命令

作用	命令	缩写	例子	备注
检出	svn checkout [URL]	svn co	svn co http://192.168.1.1/pro/domain
添加	svn add [PATH]		svn add test.php ；svn ci -m ””	添加，需要提交才能同步
提交	svn commit -m “log“ [-N] [PATH]	svn ci	svn ci -m “add test file for my test“ test.php
更新	svn update [-r ] [PATH]	svn up	svn update -r 200 test.cpp
恢复	svn revert PATH		svn revert foo.c
加锁	svn lock -m “log” PATH		svn lock -m “ lock test file “ test.php
解锁	svn unlock PATH		svn unlock test.php
删除	svn delete PATH		svn delete test.php ；svn ci -m ””	与添加一样，需要提交才能同步
复制	svn copy SRC DST		svn copy foo.txt bar.txt	SRC和DST可以是PATH也可以是URL
切换	svn switch URL[@r] [PATH]		svn switch svn://localhost/testapp	将工作副本更新到同一存储库中的其他url
合并	svn merge [—dry-run] URL[@r] URL[@r] [PATH]		svn merge -r1447:HEAD	将两个源差异应用至工作副本 —dry-run:尝试合并需要ci，才能同步
比较	svn diff [-r a:b]		svn diff -r 200:201 test.php
日志	svn log [PATH]		svn log
详情	svn info [PATH]		svn info
状态	svn status [PATH]	svn st	svn status
导出	svn export [-r ]		svn export svn://localhost/test/testapp	与检出的区别在于无.svn文件夹，无版本控制
导入	svn import -m “log” [PATH] [URL]
忽略	svn ps svn:ignore ‘VALUE’ PATH		svn ps svn:ignore ‘.vscode’ ./
自动解决冲突	svn resolve —accept ACTION PATH		svn resolve —accept mf foo.c	mf:放弃服务器 tf:放弃本地
标记冲突已解决	svn resolve PATH

# 创建分支
svn copy trunk/ branches/my_branch
svn commit -m "add my_branch" 
# 合并分支
svn merge ../branches/my_branch/
svn commit -m "add index.html"

1	svn resolve --accept mf foo.c