sd integrate

最新推荐文章于 2021-06-29 09:32:09 发布

C_peter

最新推荐文章于 2021-06-29 09:32:09 发布

阅读量782

点赞数

分类专栏：其他

本文链接：https://blog.youkuaiyun.com/wzy198852/article/details/43736401

版权

11 篇文章

订阅专栏

流程：

1. 目标branch 创建空changelist.

sd change

2. 目标client操作
sd integrate -i -c CL# 原branch文件目标branch文件.
sd integrate -i -c CL# 原branch根目录 ...@CL,CL 目标branch.

sd integrate -i -c 1686940 //depot/prod/compact7_QFE_Dev/...

sd integrate -i -c 1686940

//depot/prod/compact7_QFE_Dev/ship/private/winceos/net/dhcp/...@1685001,1686927

//depot/branches/pb/seven/CE7_enhancement/ship/private/winceos/net/dhcp/…
sd integrate -i -c 1686940

//depot/prod/compact7_QFE_Dev/ship/...@1685759,1685759 //depot/branches/pb/seven/CE7_enhancem

ent/ship/...
sd integrate -c 1686940 -i //depot/prod/compact7_SP/ship/...@1686276,1686276

//depot/branches/pb/seven/CE7_enhancement/ship/...
sd integrate -c 1686940 -i //depot/prod/compact7_SP/ship/...@1686778,1686779

//depot/branches/pb/seven/CE7_enhancement/ship/...
sd integrate -c 1686940 -i //depot/prod/compact7_SP/ship/...@1686788,1686792

sd//depot/branches/pb/seven/CE7_enhancement/ship/...
sd integrate -c 1686940 -i //depot/prod/compact7_SP/ship/...@1686795,1686795

//depot/branches/pb/seven/CE7_enhancement/ship/...
sd integrate -i -c 1686940 //depot/prod/compact7_SP/ship/...@1686798,1686799

//depot/branches/pb/seven/CE7_enhancement/ship/…
sd integrate -i -c 1686940 //depot/prod/compact7_SP/ship/private/winceos/net/dhcp/…

//depot/branches/pb/seven/CE7_enhancement/ship/private/winceos/net/dhcp…
sd integrate -i //depot/prod/compact7_SP/ship/private/winceos/net/dhcp/

… //depot/prod/compact7_QFE_Dev/ship/private/winceos/net/dhcp/…
//depot/prod/compact2013_QFE/ship/private/bat/contents.oak

3.sd resolve -a 检查冲突

4.sd submit -c CL.