使用svn进行分支合并记录

1.svn版本保存baisonext

svncommit-m'v2.0.9版本保存'

svncopysource_urltags_url-m'tagscommit'

2.合并代码流程（任务部分)

a.update代码

cd/work/doudizhu

svnup

b.创建branches(task)文件夹

svnmkdir-m'创建任务分支文件夹'http://192.168.2.126:8081/svn/doudizhu/branches/task/

从主干分支到branches/task

svncp-m'创建任务分支'

http://192.168.2.126:8081/svn/doudizhu/trunk/doudizhu/

http://192.168.2.126:8081/svn/doudizhu/branches/task/

c.没有问题后，合并到trunk

svnmerge--reintegratehttp://192.168.2.126:8081/svn/doudizhu/branches/task/doudizhu

过程中出现的问题及解决：

1.svn更新错误的解决

$svnupdate

Updating'.':

Skipped'Resources/luaScript/Utils'--Noderemainsinconflict

Skipped'Resources/luaScript/Base'--Noderemainsinconflict

Atrevision180.

svnremove--forceUtils

svnresolve--accept=workingUtils

svnup

2.lis/mobclickfactory.aisscheduledforaddition,butismissing

复制mobclkfacotry_armv6.a到指定路径

3.合并branches代码到branches

$svnmerge--reintegratehttp://192.168.2.126:8081/svn/doudizhu/branches/task/doudizhu

---RecordingmergeinfoformergebetweenrepositoryURLsinto'.':