Following are the current branches in hardware/ril: - master: for emulator-ics - b2g-jellybean: for emulator-jb - b2g-kitkat: for emulator-kk To reduce the effort on new feature development and branch maintenance, we would like to move to the new branch model [1]: - b2g-ics: new stable branch to be created, branch from current master (for emulator-ics) - master: merges aosp/kitkat after branching b2g-ics out (for emulator-kk) - b2g-kitkat: deprecated (will be created again when master moves to lollipop) - b2g-jellybean: no changes (for emulator-jb) [1] https://wiki.mozilla.org/B2G/Emulator#Branch_Model

(In reply to Edgar Chen [:edgar][:echen] from comment #0) > Following are the current branches in hardware/ril: > - master: for emulator-ics > - b2g-jellybean: for emulator-jb > - b2g-kitkat: for emulator-kk > > To reduce the effort on new feature development and branch maintenance, we > would like to move to the new branch model [1]: > - b2g-ics: new stable branch to be created, branch from current master (for > emulator-ics) > - master: merges aosp/kitkat after branching b2g-ics out (for emulator-kk) > - b2g-kitkat: deprecated (will be created again when master moves to > lollipop) > - b2g-jellybean: no changes (for emulator-jb) > > [1] https://wiki.mozilla.org/B2G/Emulator#Branch_Model The branch following `b2g-<aosp_version>` naming scheme is usually *rebased*, not *merged*. To avoid confuse, we are going to use ril version for branch naming. - b2g-ril_v7: new stable branch to be created, branch from current master (for emulator-ics) - master: moves to ril version 9 (aosp/kitkat-mr2.2-release) after branching b2g-ril_v7 out (for emulator-kk) - b2g-kitkat: no changes - b2g-jellybean: no changes (for emulator-jb)

(In reply to Edgar Chen [:edgar][:echen] from comment #1) > (In reply to Edgar Chen [:edgar][:echen] from comment #0) > > To reduce the effort on new feature development and branch maintenance, we > > would like to move to the new branch model [1]: > > The branch following `b2g-<aosp_version>` naming scheme is usually > *rebased*, not *merged*. To avoid confuse, we are going to use ril version > for branch naming. > - b2g-ril_v7: new stable branch to be created, branch from current master > (for emulator-ics) b2g-ril_v7 is created: https://github.com/mozilla-b2g/platform_hardware_ril/commits/b2g-ril_v7 > - master: moves to ril version 9 (aosp/kitkat-mr2.2-release) after branching > b2g-ril_v7 out (for emulator-kk) > - b2g-kitkat: no changes > - b2g-jellybean: no changes (for emulator-jb)

(In reply to Edgar Chen [:edgar][:echen] from comment #2) > (In reply to Edgar Chen [:edgar][:echen] from comment #1) > > (In reply to Edgar Chen [:edgar][:echen] from comment #0) > > > To reduce the effort on new feature development and branch maintenance, we > > > would like to move to the new branch model [1]: > > > > The branch following `b2g-<aosp_version>` naming scheme is usually > > *rebased*, not *merged*. To avoid confuse, we are going to use ril version > > for branch naming. > > - b2g-ril_v7: new stable branch to be created, branch from current master > > (for emulator-ics) > > b2g-ril_v7 is created: > https://github.com/mozilla-b2g/platform_hardware_ril/commits/b2g-ril_v7 yay~ thank you! > > > - master: moves to ril version 9 (aosp/kitkat-mr2.2-release) after branching > > b2g-ril_v7 out (for emulator-kk) > > - b2g-kitkat: no changes > > - b2g-jellybean: no changes (for emulator-jb)

Comment on attachment 8559147 [details] [b2g-manifest] PR #280, Update emulator hardware/ril to branch b2g-ril_v7 Try result for moving emulator hardware/ril to b2g-ril_v7: https://treeherder.mozilla.org/#/jobs?repo=try&revision=76c0c362f211&exclusion_state=all Hi seinlin, would you mind reviewing this manifest change? Thank you.

Comment on attachment 8559147 [details] [b2g-manifest] PR #280, Update emulator hardware/ril to branch b2g-ril_v7 LGTM.

(In reply to Kai-Zhen Li [:seinlin] from comment #6) > Comment on attachment 8559147 [details] > [b2g-manifest] PR #280, Update emulator hardware/ril to branch b2g-ril_v7 > > LGTM. Thank you, seinlin. master: https://github.com/mozilla-b2g/b2g-manifest/commit/0cd865a72caefc6f56f180a1a88cddb478837a49

(In reply to Edgar Chen [:edgar][:echen] from comment #2) > (In reply to Edgar Chen [:edgar][:echen] from comment #1) > > - b2g-ril_v7: new stable branch to be created, branch from current master > > (for emulator-ics) > > b2g-ril_v7 is created: > https://github.com/mozilla-b2g/platform_hardware_ril/commits/b2g-ril_v7 > > > - master: moves to ril version 9 (aosp/kitkat-mr2.2-release) after branching > > b2g-ril_v7 out (for emulator-kk) The emulator-ics is switched to b2g-ril_v7, now it is safe to move master branch to version 9.

(In reply to Edgar Chen [:edgar][:echen] from comment #8) > The emulator-ics is switched to b2g-ril_v7, now it is safe to move master > branch to version 9. The master branch is moved to RIL version 9: https://github.com/mozilla-b2g/platform_hardware_ril/commits/master

Comment on attachment 8562017 [details] [b2g-manifest] PR #285, Update emulator-kk hardware/ril to branch master Try result for moving emulator-kk hardware/ril to master: https://treeherder.mozilla.org/#/jobs?repo=try&revision=c0094757e47d Hi seinlin, would you mind reviewing this manifest change? Thank you.

Comment on attachment 8562027 [details] [platform_hardware_ril/master] PR #45 Hi hsinyi, mind reviewing this PR? Thank you.

(In reply to Edgar Chen [:edgar][:echen] from comment #12) > Comment on attachment 8562017 [details] > [b2g-manifest] PR #285, Update emulator-kk hardware/ril to branch master > > Try result for moving emulator-kk hardware/ril to master: > https://treeherder.mozilla.org/#/jobs?repo=try&revision=c0094757e47d > > Hi seinlin, would you mind reviewing this manifest change? Thank you. Edgar, can we use 'b2g-ril_v9' instead of 'master' for kk? I think we can keep developing of v9 features on master and get them merge into v9 branch. Then we don't need to update manifest many times.

(In reply to Kai-Zhen Li [:seinlin] from comment #14) > (In reply to Edgar Chen [:edgar][:echen] from comment #12) > > Comment on attachment 8562017 [details] > > [b2g-manifest] PR #285, Update emulator-kk hardware/ril to branch master > > > > Try result for moving emulator-kk hardware/ril to master: > > https://treeherder.mozilla.org/#/jobs?repo=try&revision=c0094757e47d > > > > Hi seinlin, would you mind reviewing this manifest change? Thank you. > > Edgar, can we use 'b2g-ril_v9' instead of 'master' for kk? I think we can > keep developing of v9 features on master and get them merge into v9 branch. > Then we don't need to update manifest many times. The new branching model [1] is branching b2g-ril_v9 when we are going to move to v10 (lollipop) on master. But we don't know when automated test will be ran on emulator-l, at least we are still working on enabling emulator-kk now [2]. In your proposal, developer have to maintain two *exactly-the-same* branches (master and b2g-ril_v9) during this period, it is really confused and error-prone. So I still prefer not branching b2g-ril_v9 until we are starting working on automated test on emulator-l. What do you think? Thank you. [1] https://wiki.mozilla.org/B2G/Emulator#Branch_Model [2] https://bugzilla.mozilla.org/show_bug.cgi?id=1090359

Comment on attachment 8562017 [details] [b2g-manifest] PR #285, Update emulator-kk hardware/ril to branch master It does make sense. We need to update emulator-kk manifest once hardware/ril is branched out.

Comment on attachment 8562027 [details] [platform_hardware_ril/master] PR #45 I applied the patch and no more "ALOG_" left. Thank you!

(In reply to Kai-Zhen Li [:seinlin] from comment #16) > Comment on attachment 8562017 [details] > [b2g-manifest] PR #285, Update emulator-kk hardware/ril to branch master > > It does make sense. We need to update emulator-kk manifest once hardware/ril > is branched out. Thank you, seinlin. b2g-manifest/master: https://github.com/mozilla-b2g/b2g-manifest/commit/0b50ebcaa313a80cc0c45b1ee90e7425a26573b8

(In reply to Hsin-Yi Tsai [:hsinyi] from comment #17) > Comment on attachment 8562027 [details] > [platform_hardware_ril/master] PR #45 > > I applied the patch and no more "ALOG_" left. Thank you! Thank you, Hsinyi. platform_hardware_ril/master: https://github.com/mozilla-b2g/platform_hardware_ril/commit/c3971822a2b6ddddf92be818083717959af10304