标签:download svn add stop mes inux size alac mil linux
简易:
一、查看分支信息
当然合并之前必须把目标分支download下来!!!
svn://192.168.1.80:3698/C/branches/pirate/rpcfw/specialactivety
svn log --verbose --stop-on-copy | tail -10
svn merge svn://127.0.0.1/repos/main
svn merge -r 17888:18665 svn://192.168.1.80:3698/C/branches/pirate/rpcfw/specialactivety
filename.merge-left.r18665 filename.merge-right.r17888 filename.working filename
svn commit -m "test" //提交
a),创建分支,只能在同一个仓库内进行,跨仓库是不行的。会提示 :
svn: No repository found in ‘svn://127.0.0.1‘
b),创建分支时,注意加上注释,不然会报以下错误。
[root@BlackGhost repos]# svn cp svn://127.0.0.1/repos/main svn://127.0.0.1/repos/branch svn: Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options svn: None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no ‘editor-cmd‘ run-time configuration option was found
标签:download svn add stop mes inux size alac mil linux
原文地址:https://www.cnblogs.com/cww0814/p/8966557.html