使用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 '.':