Editing Qt Maemo Git Process
Warning: You are not logged in.
Your IP address will be recorded in this page's edit history.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
- | + | The Maemo version of Qt lives here: | |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
http://gitorious.org/+qt-maemo-developers/qt/qt-maemo | http://gitorious.org/+qt-maemo-developers/qt/qt-maemo | ||
- | |||
- | |||
- | + | If you have a local clone you can use <code>gitk --all</code> to see a visual representation of the branches, commits and merges. | |
- | + | ||
- | + | ||
- | + | lbt proposed this explanation of the branches/workflow based on the [[Mer/Build/UsingGitorious|Mer gitorious workflow]] | |
- | |||
== Origin == | == Origin == | ||
The branches are synced with upstream Qt changes. No Maemo changes are there at all. | The branches are synced with upstream Qt changes. No Maemo changes are there at all. | ||
Line 26: | Line 16: | ||
== Maemo master branches == | == Maemo master branches == | ||
+ | Currently we have 4.5 master branch only. | ||
- | + | === master-maemo-qt-45 === | |
- | === | + | This branch is based on 4.5 and has all feature branches selected for maemo merged into it. |
- | + | Note that this branch is fairly plain Qt and should contains no packaging data and debian/* should not exist. | |
- | This branch is | + | |
- | + | ||
- | + | ||
- | + | ||
If an updates is made to 4.5 and 4.5 is merged into master-maemo-qt-4.5 then *all* conflicts with all feature/bug branches will be seen at once. | If an updates is made to 4.5 and 4.5 is merged into master-maemo-qt-4.5 then *all* conflicts with all feature/bug branches will be seen at once. | ||
Line 40: | Line 27: | ||
At this point it may seem reasonable to simply re-merge each feature branch into master-maemo-qt-4.5 however master-maemo-qt-4.5 contains all the other features from the last merge. So as soon as the first conflict-resolved feature is merged, all the conflicts from all the other features will be hit. | At this point it may seem reasonable to simply re-merge each feature branch into master-maemo-qt-4.5 however master-maemo-qt-4.5 contains all the other features from the last merge. So as soon as the first conflict-resolved feature is merged, all the conflicts from all the other features will be hit. | ||
The answer is to create a temporary local branch based on the latest 4.5 (see http://wiki.maemo.org/Mer/Build/UsingGitorious#Upstream_Updates) and merge each feature in turn into this branch. Then merge that into master-maemo-qt-4.5 (which should have no conflicts at all and, in the absence of any features/bugs is a simple fast-forward). | The answer is to create a temporary local branch based on the latest 4.5 (see http://wiki.maemo.org/Mer/Build/UsingGitorious#Upstream_Updates) and merge each feature in turn into this branch. Then merge that into master-maemo-qt-4.5 (which should have no conflicts at all and, in the absence of any features/bugs is a simple fast-forward). | ||
+ | |||
== Maemo build branches == | == Maemo build branches == | ||
- | These branch should be built completely and used for regular release. | + | These branch should be built completely and used for regular release. There are based on master-maemo-qt-45 currently. |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
=== qt-diablo === | === qt-diablo === | ||
Diablo branch | Diablo branch | ||
- | === qt- | + | === qt-fremantle === |
- | + | Fremantle branch, but this is not ready yet. | |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
=== qt-mer === | === qt-mer === | ||
Currently there is no branch. | Currently there is no branch. | ||
+ | |||
== Maemo build script and debian folder == | == Maemo build script and debian folder == | ||
=== maemo-build-generic === | === maemo-build-generic === | ||
- | This branch is based on and tracks master-maemo-qt-4.5 | + | This branch is based on and tracks ??(I suggest master-maemo-qt-4.5) |
- | It contains common packaging that allows Qt to build on various maemo-ish releases. | + | It contains common packaging (ie debian/*) that allows Qt to build on various maemo-ish releases. |
A good rule is that no code is touched by non-merge commits to this branch | A good rule is that no code is touched by non-merge commits to this branch | ||
It simply merges master-maemo-qt-4.5 | It simply merges master-maemo-qt-4.5 | ||
Line 82: | Line 62: | ||
There are some scripts to manage maemo branches or create release pacakge etc. | There are some scripts to manage maemo branches or create release pacakge etc. | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
== Maemo fixes == | == Maemo fixes == | ||
Line 110: | Line 73: | ||
=== hildon-* === | === hildon-* === | ||
Each of these branches contain changes able to integrate Qt in the hildon environment. (Input method, menus, style). | Each of these branches contain changes able to integrate Qt in the hildon environment. (Input method, menus, style). | ||
- | TO FIX: Actually the widget-* branches | + | TO FIX: Actually the widget-* branches shoul be renamed in hildon-widget-* |
=== hw-* === | === hw-* === | ||
Line 122: | Line 85: | ||
The main covered areas are: | The main covered areas are: | ||
- | - maemo-build-* | + | - maemo-build-* |
- maemo-qt-scripts | - maemo-qt-scripts | ||
- others maemo related areas. | - others maemo related areas. | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
[[Image:MaemoQtOnGit-Diagram-opt2.jpg]] | [[Image:MaemoQtOnGit-Diagram-opt2.jpg]] | ||
- | |||
- | |||
- |
Learn more about Contributing to the wiki.