合入分支代码

------------------------>分支集成

1）查看分支修改日志

svn log–stop-on-copy 分支名

例如：

svn log --stop-on-copy svn://192.168.10.4/ALPS_GB2_V2.10_MT6515_MT6626_NAND_RGT/branches/jiayusheng/G101_jys_20120820_GYLYSW-40

2）merge 分支到本地trunk或者分支上

如上图所示查看得到的分支的最早版本号为1645

则merge的时候只要选择merge最早的版本号到最新的版本号的范围即可

语句如下：

svn merge -r 1645:HEADsvn://192.168.10.4/ALPS_GB2_V2.10_MT6515_MT6626_NAND_RGT/branches/jiayusheng/G101_jys_20120820_GYLYSW-40

 

这样就会将上述分支修改的文件 merge到你本地的trunk或者分支上

 

3）copy覆盖已修改的trunk或者分支到mtk的trunk上然后编译

cp –rf trunk/* mtk_trunk

编译

./mk -o=TARGET_BUILD_VARIANT=user rgt_projects路径下的项目配置文件名 new

---------------------> 部分命令记录

1 logo /mediatek/custom/common/uboot/logo/hvga

2 输出当前目录下所有文件名到file3.txt文件中。
find . -name *.* | grep -v '.svn' | tee file3.txt
find . -name *.* | tee file3.txt

3

 a  创建远程分支
svn copy svn://192.168.10.4/ALPSGBFDD2MPV3.9/tags/G60_NO_ATV_BASE svn://192.168.10.4/ALPSGBFDD2MPV3.9/branches/g60_zyl_camera_0312 -m "copied" --username xzg --password ****** --non-interactive 
 b 下载远程分支
svn info g10_20120209code 
successfully (0)
svn list svn://192.168.10.4/ALPSGBFDD2MPV3.9/tags/G60_NO_ATV_BASE/ --verbose --username xzg --password ****** --non-interactive 
svn list svn://192.168.10.4/ALPSGBFDD2MPV3.9/tags/G60_NO_ATV_BASE/ --verbose --username xzg --password ****** --non-interactive 
successfully (0)
svn checkout svn://192.168.10.4/ALPSGBFDD2MPV3.9/tags/G60_NO_ATV_BASE/ /home/xzg/g60/ --username xzg --password ****** --non-interactive 

//-g6-g6---
VNC config -no&ing
svn://192.168.10.4/alps1048v5_g6/trunk


//编译 framework-res.apk
cd ~/g6_branches2;
. /etc/android.conf;
source build/envsetup.sh;
cd /home/xzg/g6_branches2/frameworks/base/core/res;
touch res/layout/zzz_keyguard_screen_tab_unlock_gemini.xml;
TARGET_PRODUCT=ragentek16_a10y mm;

//切换分支
svn switch svn://192.168.10.4/ALPSGBFDD2MPV3.9/branches/g10_1215_weather_lockscreen_xzg


//g3----------------------------------------------------------------------------
./mk ragentek16_a10y_g3_jyy_c javaoptgen
./mk ragentek16_a10y_g3_jfy_b r dr android.policy;
./mk ragentek16_a10y_g3_jfy_b r dr framework;
./mk ragentek16_a10y_g3_jfy_b r dr framework-res;
./mk ragentek16_a10y_g3_xjz_e r dr android.policy;
./mk ragentek16_a10y_g3_xjz_e r dr framework;
./mk ragentek16_a10y_g3_xjz_e r dr framework-res;
./mk g3 r dr Phone;

//git//
git clone git@192.168.10.4:R722XA10982301.git
source /etc/android23.conf;
source ./build/envsetup.sh;
choosecombo;
make
------------------------------------
git checkout dev_shell;
git pull --rebase origin dev_shell;
git checkout -b QYLLSW-1131 dev_shell;
------------------------------------
git status;
git add .......
git status;
git commit -m "QYLLSW-1131 [reviewer:xianwei.li] fix bug: after lock sim";
----------------------------------------
git checkout dev_shell
git merge QYLLSW-1131;
git pull --rebase origin dev_shell
git push origin dev_shell:dev_shell;
----------------------------------------