Merge lp://qastaging/~dpm/humpolec/converge-branches into lp://qastaging/humpolec
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~dpm/humpolec/converge-branches |
| Merge into: | lp://qastaging/humpolec |
| Diff against target: |
3279 lines (+3057/-0) 36 files modified
.bzrignore (+1/-0) Android/boot-manager/Android.mk (+12/-0) Android/boot-manager/Makefile (+15/-0) Android/boot-manager/bootimg.h (+100/-0) Android/boot-manager/bootmgr.c (+149/-0) Android/loop-mount-agent/Android.mk (+27/-0) Android/loop-mount-agent/aloopmount.cpp (+133/-0) Ubuntu/Makefile (+203/-0) Ubuntu/app/Makefile (+14/-0) Ubuntu/app/tests/autopilot/contactsimporter/__init__.py (+132/-0) Ubuntu/app/tests/autopilot/contactsimporter/main/__init__.py (+1/-0) Ubuntu/app/tests/autopilot/contactsimporter/main/test_main.py (+23/-0) Ubuntu/app/tests/autopilot/run (+11/-0) Ubuntu/app/tests/unit/tst_hellocomponent.qml (+49/-0) Ubuntu/app/ubuntudualboot.desktop (+8/-0) Ubuntu/app/ubuntudualboot.qml (+57/-0) Ubuntu/backend/Makefile (+205/-0) Ubuntu/backend/backend.pro (+8/-0) Ubuntu/backend/modules/ubuntuboot/Makefile (+887/-0) Ubuntu/backend/modules/ubuntuboot/backend.cpp (+17/-0) Ubuntu/backend/modules/ubuntuboot/backend.h (+18/-0) Ubuntu/backend/modules/ubuntuboot/moc_backend.cpp (+155/-0) Ubuntu/backend/modules/ubuntuboot/moc_mytype.cpp (+162/-0) Ubuntu/backend/modules/ubuntuboot/moc_ubuntuboot.cpp (+213/-0) Ubuntu/backend/modules/ubuntuboot/qmldir (+2/-0) Ubuntu/backend/modules/ubuntuboot/ubuntuboot.cpp (+35/-0) Ubuntu/backend/modules/ubuntuboot/ubuntuboot.h (+50/-0) Ubuntu/backend/modules/ubuntuboot/ubuntuboot.pro (+36/-0) Ubuntu/click/manifest.json (+15/-0) Ubuntu/click/plugin/ubuntuboot/qmldir (+2/-0) Ubuntu/click/ubuntudualboot.desktop (+8/-0) Ubuntu/click/ubuntudualboot.json (+8/-0) Ubuntu/click/ubuntudualboot.qml (+57/-0) Ubuntu/click_howto (+9/-0) Ubuntu/ubuntudualboot.pro (+11/-0) install/dualboot.sh (+224/-0) |
| To merge this branch: | bzr merge lp://qastaging/~dpm/humpolec/converge-branches |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| The Humpolec team | Pending | ||
|
Review via email:
|
|||
Description of the change
Currently the humpolec trunk branch associated with the project only contains the Android app.
Other branches including Android backend bits, the Ubuntu app and the installation script are scattered around under ~humpolec-
This makes it difficult to send merge proposals and to find out which branches are part of the project and which ones are either obsolete or feature branches from other contributors.
This merge proposal seeks to solve this issue with a light reorganization of the source tree to include all the code in one single branch. There are no changes in the code itself, it's simply an addition of the code in separate branches to the project's trunk branch.
| Rex Tsai (chihchun) wrote | # |
| David Planella (dpm) wrote | # |
| Rex Tsai (chihchun) wrote | # |
Unmerged revisions
- 65. By David Planella
-
Removed files that don't need to be under version control as they are generated
- 64. By David Planella
-
Merged ubuntudualboot branch
- 63. By David Planella
-
Merged install-script branch
- 62. By David Planella
-
Merged bootmgr branch
- 61. By David Planella
-
Merged android-
loop-mount- agent branch - 60. By David Planella
-
Reorganized the source tree in preparation to adding the different parts of the project to the same branch
Thanks
These are different codebase, I would prefer to keep them separated. Because each project need to be built with different build environment.