svn process
TRANSCRIPT
![Page 1: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/1.jpg)
QQ团购SVN使用
![Page 2: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/2.jpg)
QQ团购SVN使用总结
• 1、checkout
• 2、开发新的项目:创建分支
• 3、项目间切换:切换分支
• 4、项目提测: merge分支至tag
• 5、项目发布: merge tag分支至主干
• 5、项目稳定后:删除tag分支
• 6、查看操作日志
![Page 3: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/3.jpg)
SVN文件结构
![Page 4: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/4.jpg)
Checkout主干
![Page 5: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/5.jpg)
Checkout主干
![Page 6: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/6.jpg)
Checkout主干
![Page 7: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/7.jpg)
创建分支
![Page 8: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/8.jpg)
创建分支
![Page 9: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/9.jpg)
创建分支
![Page 10: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/10.jpg)
创建分支
![Page 11: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/11.jpg)
创建分支
https://tc-svn/isd/isd_webrebuild_rep/vip_tuan_proj/branches/2012_01/05_opencm用户识别
第一期V2.1
![Page 12: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/12.jpg)
创建分支
![Page 13: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/13.jpg)
创建分支
![Page 14: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/14.jpg)
切换分支
![Page 15: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/15.jpg)
切换分支
![Page 16: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/16.jpg)
切换分支
![Page 17: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/17.jpg)
切换分支
![Page 18: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/18.jpg)
切换分支
![Page 19: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/19.jpg)
merge分支至tag
1、在tag下创建提测分支
2、切换到提测分支
3、合并代码(解决冲突)
4、提交代码
![Page 20: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/20.jpg)
merge分支至tag
1、在tag下创建提测分支
https://tc-
svn/isd/isd_webrebuild_rep/vip_tuan_proj/tags/v2.1_ClubGrouponOpencm1.0Beta47
v2.1_ClubGroupon1.0Beta101Build101(客户端)
v2.1_ClubGrouponOpencm1.0Beta47(opencm)
v1.1_ClubGrouponJS1.0Beta53(V1版权)
v2.1_ClubGroupon1.0RC_20120222(日常)
创建时,写下备注:
/branches/2012_01/05_opencm用户识别第一期V2.1 提测
![Page 21: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/21.jpg)
merge分支至tag
![Page 22: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/22.jpg)
merge分支至tag
![Page 23: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/23.jpg)
merge分支至tag
![Page 24: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/24.jpg)
merge分支至tag
![Page 25: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/25.jpg)
merge分支至tag
![Page 26: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/26.jpg)
merge分支至tag
![Page 27: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/27.jpg)
merge分支至tag
![Page 28: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/28.jpg)
merge分支至tag
![Page 29: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/29.jpg)
merge分支至tag
![Page 30: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/30.jpg)
merge分支至tag
/branches/2012_02/16_新版团购标题优化V2.1 提测
![Page 31: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/31.jpg)
merge分支至tag
![Page 32: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/32.jpg)
merge分支至tag
![Page 33: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/33.jpg)
merge分支至tag
![Page 34: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/34.jpg)
merge分支至tag
![Page 35: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/35.jpg)
merge分支至tag
![Page 36: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/36.jpg)
merge分支至tag
![Page 37: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/37.jpg)
merge分支至tag
![Page 38: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/38.jpg)
merge分支至tag
![Page 39: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/39.jpg)
merge tag分支至主干
• 和merge branches 分支至tag是一样的
![Page 40: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/40.jpg)
删除tag分支
• 项目发布稳定(发布后一二天),tag上有相同类型
• Tag上类型:
– V1版本:v1.1_ClubGrouponJS1.0Beta53
– 日常:v2.1_ClubGroupon1.0RC_20111107
– Opencm:v2.1_ClubGrouponOpencm1.0Beta47
– 客户端:v2.1_ClubGroupon1.0Beta100Build100
![Page 41: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/41.jpg)
删除tag分支
![Page 42: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/42.jpg)
删除tag分支
![Page 43: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/43.jpg)
查看操作日志
![Page 44: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/44.jpg)
查看操作日志
![Page 45: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/45.jpg)
查看操作日志
![Page 46: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/46.jpg)
Q&A
![Page 47: Svn process](https://reader031.vdocuments.us/reader031/viewer/2022013115/559488e51a28ab0e7d8b465b/html5/thumbnails/47.jpg)
Thanks