以main模块为例
1. 从主干拉去新分支
svn cp http://svn.rong360.com/svn/main/trunk http://svn.rong360.com/svn/main/branches/branchYYYYMMDD_xx -m 'xx'
2. 检出到本地
svn co http://svn.rong360.com/svn/main/branches/branchYYYYMMDD_xx
3. 开发
4. 提交代码到分支 svn ci -m ' '
5. 合并主干文件 svn merge http://svn.rong360.com/svn/main/trunk
6. 解决冲突，提交代码到分支
7. rdiff 填写reviewer （或提交测试）
8. 测试通过后根据要求再次合并主干代码
9. 填写上线单 分支上线，部署，上线检查，上线完成确认
10. 切换分支代码到主干 svn merge --reintegrate http://svn.rong360.com/svn/main/branches/branchYYYYMMDD_xx
11. 解决问题，提交代码到主干
[rong@rd-dev22 mis]$ svn ci
Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c
Sending controller/PushplatformController.php
Transmitting file data .
Committed revision 2907.
[rong@rd-dev22 mis]$ svn merge http://svn.rong360.com/svn/mis/trunk
[rong@rd-dev22 mis]$ rdiff
branchUrl:http://svn.rong360.com/svn/mis/branches/branch20173020_app_push
trunkUrl : http://svn.rong360.com/svn/mis/trunk/@2906
Commit message has errors:
- Invalid or missing field "Test Plan": You must provide a test plan.
Describe the actions you performed to verify the behavior of this
change.
You must resolve these errors to continue.
Do you want to edit the message? [Y/n] y
Linting...
No lint engine configured for this project.
Running unit tests...
No unit test engine is configured for this project.
Created a new Differential revision:
Revision URI: http://codereview.rong360.com/D8218
Included changes:
M controller/PushplatformController.php
[rong@rd-dev22 mis]$ ^C
[rong@rd-dev22 mis]$ svn sw http://svn.rong360.com/svn/mis/trunk
U controller/PushplatformController.php
Updated to revision 2908.
[rong@rd-dev22 mis]$ svn merge --reintegrate http://svn.rong360.com/svn/mis/branches/branch20173020_app_push
svn: Cannot reintegrate into a working copy that has local modifications
[rong@rd-dev22 mis]$ svn st
M .
[rong@rd-dev22 mis]$ svn info
Path: .
URL: http://svn.rong360.com/svn/mis/trunk
Repository Root: http://svn.rong360.com/svn/mis
Repository UUID: 1a2d6029-1b22-4e0e-a00e-c5f2e95b9dac
Revision: 2908
Node Kind: directory
Schedule: normal
Last Changed Author: suoyi
Last Changed Rev: 2904
Last Changed Date: 2017-03-17 11:07:10 +0800 (Fri, 17 Mar 2017)
[rong@rd-dev22 mis]$ svn revert .
Reverted '.'
[rong@rd-dev22 mis]$ svn merge --reintegrate http://svn.rong360.com/svn/mis/branches/branch20173020_app_push
--- Merging differences between repository URLs into '.':
U controller/PushplatformController.php
[rong@rd-dev22 mis]$ svn ci
Log message unchanged or not specified
(a)bort, (c)ontinue, (e)dit:
c
Sending .
Sending controller/PushplatformController.php
Transmitting file data .
Committed revision 2909.
[rong@rd-dev22 mis]$ svn st
[rong@rd-dev22 mis]$ svn info
Path: .
URL: http://svn.rong360.com/svn/mis/trunk
Repository Root: http://svn.rong360.com/svn/mis
Repository UUID: 1a2d6029-1b22-4e0e-a00e-c5f2e95b9dac
Revision: 2909
Node Kind: directory
Schedule: normal
Last Changed Author: frank
Last Changed Rev: 2909
Last Changed Date: 2017-03-20 14:17:39 +0800 (Mon, 20 Mar 2017)
[rong@rd-dev22 mis]$