svn co 代码分支路径

svn up

svn ci -m “log”

svn propset -r 47805 –revprop svn:log 代码分支路径

svn add 增加的文件路径与名称

svn revert –depth=infinity .

svn revert path

svn merge b分支URL

如果已经提交到SVN服务器。

snippet.bash

svn up
svn log -v -l3
svn merge -r 当前版本号:回滚到的版本号 “”
svn diff
svn ci -m “回滚致”

注：

以上svn merge命令有几种情况：

• 如果仅回滚某个版本：svn merge -c -回滚到的版本号 .
• 如果回滚版本号不连续：svn merge -c -回滚到的版本号1,-回滚到的版本号2 .
• 如果回滚连续版本号：svn merge -r 开始版本号（包含）:结束版本号（不包含） .

svn switch 新URL

snippet.bash

svn merge trunk_svn_URL
svn merge -c 66060 trunk_svn_URL
svn merge -r 66059:66060 trunk_svn_URL

svn merge -c -66060 trunk_svn_URL

svn st | grep '^?' | awk '{print $2}' | xargs rm -rf

svn st

svn st | grep -v '^?'

生成.diff文件：
svn diff > yz.diff

使用.diff文件：
patch –p0 –d ./ < yz.diff

提取HEAD版本最近修改日期并格式化：

snippet.bash

svn info | sed -n "/^Last Changed Date:[ ]*/p" | sed "s/[ ]*Last Changed Date:[ ]*//g" | sed "s/-//g" | awk '{print $1}'

输出格式：20170125

"added: svn:executable"问题

有时候新增文件，svndiff最后会提示“added: svn:executable”，可以使用以下命令消除：

svn propdel svn:executable <文件>

"Property 'svn:mime-type' not found"问题

arc diff
svn: warning: W200017: Property 'svn:mime-type' not found on 'set_variables.sql@'
svn: E200000: A problem occurred; see other errors for details

解决方法：

snippet.bash

svn propset svn:mime-type text/plain set_variables.sql

"Property changes"问题

snippet.bash

svnst
MM   vendor/gbase/storage/express/shared/core/ExpressEngine.cpp
 
svn diff vendor/gbase/storage/express/shared/core/ExpressEngine.cpp
Property changes on: vendor/gbase/storage/express/shared/core/ExpressEngine.cpp
------
Modified: svn:mergeinfo

解决方法：

先拷贝该文件：

snippet.bash

cp -f vendor/gbase/storage/express/shared/core/ExpressEngine.cpp ExpressEngine.cpp.bak

再revert：

snippet.bash

svn revert vendor/gbase/storage/express/shared/core/ExpressEngine.cpp

最后覆盖该文件：

snippet.bash

cp -f ExpressEngine.cpp.bak vendor/gbase/storage/express/shared/core/ExpressEngine.cpp