使用svn进行分支合并记录

1. svn版本保存baisonext
svn commit -m 'v2.0.9版本保存'
svn copy source_url tags_url -m 'tags commit'

2. 合并代码流程（任务部分)
a. update代码
cd /work/doudizhu
svn up

b. 创建branches(task) 文件夹
svn mkdir -m '创建任务分支文件夹' http://192.168.2.126:8081/svn/doudizhu/branches/task/

从主干分支到branches/task
svn cp -m '创建任务分支'
http://192.168.2.126:8081/svn/doudizhu/trunk/doudizhu/
http://192.168.2.126:8081/svn/doudizhu/branches/task/

c. 没有问题后，合并到trunk
svn merge --reintegrate http://192.168.2.126:8081/svn/doudizhu/branches/task/doudizhu

过程中出现的问题及解决：
1. svn更新错误的解决
$ svn update
Updating '.':
Skipped 'Resources/luaScript/Utils' -- Node remains in conflict
Skipped 'Resources/luaScript/Base' -- Node remains in conflict
At revision 180.

svn remove --force Utils
svn resolve --accept=working Utils
svn up

2. lis/mobclickfactory.a is scheduled for addition, but is missing
复制mobclkfacotry_armv6.a到指定路径

3. 合并branches代码到branches
$ svn merge --reintegrate http://192.168.2.126:8081/svn/doudizhu/branches/task/doudizhu
--- Recording mergeinfo for merge between repository URLs into '.':