Now `master` becomes a development/integration branch that contains our latest changes and also synced with upstream [1]. In this bug, I would like to port master branch to kitkat-mr2.2 first in order to support running automated tests on emulator-kk. ((Porting to lollipop will be tracking on a separated bug)) [1] https://android.googlesource.com/platform/external/qemu.git [2] https://android.googlesource.com/platform/external/qemu.git/+/kitkat-mr2.2-release

emulator-ics use `master` branch now, before porting master to kitkat-mr2.2, we need to create a separated branch (e.g. b2g-ics) from current master for emulator-ics.

Comment on attachment 8606209 [details] [b2g-manifest] PR #338, Update emulator-ics external/qemu to branch b2g-ics Hi Seinlin, would you mind reviewing this? Thank you. try result: https://treeherder.mozilla.org/#/jobs?repo=try&revision=fb1eccd879c2

Comment on attachment 8606209 [details] [b2g-manifest] PR #338, Update emulator-ics external/qemu to branch b2g-ics LGTM.

Travis-ci result: https://travis-ci.org/mozilla-b2g/b2g-manifest/builds/62719155

Comment on attachment 8608554 [details] [platform_external_qemu:master] PR #140, Port master branch to kitkat-mr2.2 Hi Thomas, this pull request is to merge the master with aosp/kitkat-mr2.2. Try result is green [1], and emualtor-kk/emualtor-x86-kk can boot up normally in my local environment. However, we still miss nfc changes in master, I will send a separated pull request to cherry-pick all nfc changes to master. May I have your review? Thank you. [1] https://treeherder.mozilla.org/#/jobs?repo=try&revision=93c5a7b8ef49

Hi Edgar, Thanks for working on this bug, but let's discuss this further. IMHO 'master' should mirror the AOSP tree at [1]. Merging makes the history undecipherable. Ideally we'd have a branch 'b2g-master' that contains our changes and can be rebased on top of master. I know this different from our last discussion. I'd welcome any further idea or comment. No matter what we do, it never seems right. :( https://android.googlesource.com/platform/external/qemu/+/master

[1] https://android.googlesource.com/platform/external/qemu/+/master

Chris, last time I rebased a branch in a Github repo, git.m.o stopped mirroring the branch. Is it actually possible to rebase without breaking git.m.o? The use case is given in comment 8.

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #8) > Hi Edgar, > > Thanks for working on this bug, but let's discuss this further. > > IMHO 'master' should mirror the AOSP tree at [1]. > > Merging makes the history undecipherable. Ideally we'd have a branch > 'b2g-master' that contains our changes and can be rebased on top of master. But this means `b2g-master` needs a force push for each rebase process. This also breaks the history. :( I am using merge is because in this way we could just merge the changes from upstream, instead of rebasing all our changes again and again (I believe there will be more and more feature/fix added on qemu). It more like maintaining a branch that isn't based on any specific AOSP tree, but pick what we want from AOSP. > > I know this different from our last discussion. I'd welcome any further idea > or comment. No matter what we do, it never seems right. :( My intention more like maintaining a branch that isn't based on any specific AOSP tree, but pick what we want from AOSP. > > https://android.googlesource.com/platform/external/qemu/+/master

Comment on attachment 8608554 [details] [platform_external_qemu:master] PR #140, Port master branch to kitkat-mr2.2 Let's discuss this further. Thank you, Thomas.

I know, I know, rebasing has its problems as well. The problem with merging to me is that it seems easy for our changes to get lost in the stream of upstream patches. Can you please merge the patch for the manifest file? So we're making at least a bit of progress. And I think it's also save to forward 'master' to our current 'b2g-kk' branch. That will add NFC support as well.

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #13) > I know, I know, rebasing has its problems as well. The problem with merging > to me is that it seems easy for our changes to get lost in the stream of > upstream patches. > > Can you please merge the patch for the manifest file? So we're making at > least a bit of progress. And I think it's also save to forward 'master' to > our current 'b2g-kk' branch. That will add NFC support as well. Merged: https://github.com/mozilla-b2g/b2g-manifest/commit/0855f9a84156c55d501d41596d34918b2018eb1c

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #10) > last time I rebased a branch in a Github repo, git.m.o stopped mirroring the > branch. Is it actually possible to rebase without breaking git.m.o? The use > case is given in comment 8. Thomas: do you have a bug # for the previous rebase attempt? That might help prevent the issue on subsequent attempts. cc-ing some folks from dev services who would know more here.

Chris, the pull request for bug 1129257 introduced some weird commits into the git history of bluetoothd. [1] I cleaned up the commits and force-pushed the result into [1]. git.m.o did not pickup this change and ignored the repository until the original history had been restored. [1] https://github.com/mozilla-b2g/platform_system_bluetoothd

Hal: can you find someone in dev services to own this, or pass to lmandel to do the same? At the very least we should coordinate the timing of the rebase attempt so someone can fix immediately if it goes sideways.

Per previous discussion, emulator-kk will still use b2g-kitkat branch, so close this bug.