Merge branch code

------------------------> Branch integration

1) view the branch modification log

SVN log-stop-on-copy branch name

For example:

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) branches of merge to the local trunk or branch

As shown in, the earliest version of the obtained branch is 1645

Then, you only need to select the earliest merge version number to the latest version number range.

The statement is as follows:

SVN merge-r 1645: headsvn: // 192.168.10.4/alps_gb2_v2.10_mt6515_mt6626_nand_rgt/branches/jiayusheng/G101_jys_20120820_GYLYSW-40

 

In this way, the above branch modification file merge will be directed to your local trunk or branch

 

3) Copy overwrites the modified trunk or the trunk that branches to the MTK and then compiles

CP-RF trunk/* mtk_trunk

Compile

./MK-O = target_build_variant = user rgt_projects

---------------------> Some command records

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

2. Output all files under the current directory to the file3.txt file.
Find.-Name *. * | grep-V '. SVN' | tee file3.txt
Find.-Name *. * | tee file3.txt

3

A. Create a remote Branch
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. Download remote Branch
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

// Compile 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;

// Switch Branch
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;
----------------------------------------