View source for Development Branches Policy
From Openmoko
You do not have permission to edit this page, for the following reasons:
You can view and copy the source of this page:
Template used on this page:
Return to Development Branches Policy.
You do not have permission to edit this page, for the following reasons:
You can view and copy the source of this page:
Template used on this page:
Return to Development Branches Policy.
This page is used to describe the policy we use for the different software development branches.
[Please complete/correct this page]
The git repository can be seen at this address : http://git.openmoko.org/?p=openmoko.git
We want to release a product every few months. Every release will have a unique name (of course :-) )
The git server is at this address : git.openmoko.org
The current release name is ASU, so the current git branches for the release are :
There are several phases of a software release.
So every time we start developing a new release we branch from openmoko.dev into two branches:
Every developer related to the current release will work on the dev branch before release phase, and then merge into the stable branch.
In any case, all the project versions are specified on stable branch from the beginning to the end.
At developing phase, all the project versions shall be locked, exception those projects highly related to our product on dev branch.
At feature lock phase, all the projects version shall be locked, exception those projects that only controlled by Openmoko on dev branch. For our projects fixed version are recommend in this phase.
When entering releasing phase, every developers will switch to stable branch, and only bug fix is allowed here. Developers shall send out update request to distrobution team.
After testing team confirm that all fixable bug or all bug need to be fixed are fixed, release the image from stable branch. Merge the changes from stable branch to openmoko.dev, after release.
Here is a little graph that can explain things. The horizontal axis represents the time, the red lines represent some possible operations.