代码合入

来源:互联网 发布:matlab提取矩阵某一列 编辑:程序博客网 时间:2024/05/17 22:55
以yl_spf_2.0合入prebuilt_HY11为列:
进到10.5.11.110:
buildfarm@bf-rmnj-10:~/qualcomm/modem/SPF2.0/amss$
查看tag:git tag  没有新tag的话就更新高通大版本,http://jenkins-nj.yulong.com/view/AutoTools/job/qualcomm_sync_all/
对比两个tag之间的差异:git diff --name-status 前一个tag...后一个tag(前一一般就是git tag 看到的新tag上面的)
进到10.5.11.107:
cd ~/work/upgrade/QBU/QBU-SPF2.0/BaseLine-SPF2.0/MODEM
git fetch git://10.5.11.110/modem/SPF2.0/amss tag r16000.1.103970.1.115622.1
git checkout r16000.1.103970.1.115622.1 -f
git subtree split -P LA.UM.5.6/LINUX/android/vendor/qcom/proprietary/prebuilt_HY11/ -b prebuilt_r16000.1.103970.1.115622.1(prebuilt_r16000.1.103970.1.115622.1命名需要和以前的版本不一样)
cd ~/work/SPF/vendor/qcom/proprietary/prebuilt_HY11
yogi@bf-rmnj-07:~/work/SPF/vendor/qcom/proprietary/prebuilt_HY11$ git fetch ~/work/upgrade/QBU/QBU-SPF2.0/BaseLine-SPF2.0/MODEM/ prebuilt_r16000.1.103970.1.115622.1:prebuilt_r16000.1.103970.1.115622.1
git checkout -b yl_spf_2.0
git cherry-pick prebuilt_r16000.1.103970.1.115622.1
git push yl.nj HEAD:refs/for/yl_spf_2.0