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 == |
- | + | ||
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. | ||
=== master === | === master === | ||
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 43: | Line 30: | ||
== 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. | ||
- | |||
- | |||
- | |||
- | |||
- | |||
=== 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 | + | |
+ | == Maemo build script and debian == | ||
=== 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 80: | Line 59: | ||
=== maemo-qt-scripts === | === maemo-qt-scripts === | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
== Maemo fixes == | == Maemo fixes == | ||
- | |||
- | |||
=== bug-* === | === bug-* === | ||
Representing potential bugs in Qt | Representing potential bugs in Qt | ||
Line 109: | Line 67: | ||
=== hildon-* === | === hildon-* === | ||
- | |||
- | |||
- | |||
=== hw-* === | === hw-* === | ||
- | + | === widgets-* === | |
- | + | ||
- | + | ||
- | + | ||
=== maemo-* === | === maemo-* === | ||
- | Representing features in various areas and branched from | + | Representing features in various areas and branched from ?master? (I suggest this should be 4.5) |
Each branches adds only one feature-area. | Each branches adds only one feature-area. | ||
- | + | The ???(4.5) branch will be merged into them to keep them up-to-date. If the feature is adopted upstream the branch will be deleted. | |
- | The | + | ?How are dependencies handled? eg if a maemo- feature uses a hw-feature? |
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + | ||
- | + |
Learn more about Contributing to the wiki.