Hi, in order to improve the overall workflow and release a stable ASU in the coming weeks we decided to change our development structure:
- As you already know - we moved from monotone to git which seems to be the better choice when it comes to speed and ease of use. The monotone servers are not updated anymore and we will removed in the near future. - At the same time we defined a branch policy to allow the continuous development and stabilization of the code base. We will have 3 branches: Our unstable branch from what we will create our $release (currently ASU) development branch. All "foreign" code base will be frozen in that branch and only openmoko code will be changed to meet the release objectives. All packages which are feature complete will be merged into the third branch to undergo testing and bugfixing. No features will be added there. To get a picture of the full process see that page: http://wiki.openmoko.org/wiki/Development_Branches_Policy Julian will maintain the unstable and the development branch and Holger is the maintainer of the stable branch. - To finish the ASU we worked on a feature plan during the last days. We will publish the remaining items in the openmoko wiki, so that everybody can track the progress. This work in progress and will be finished today (hopefully). I will send the link to the list as soon as it is completely done. Please, adjust your branch settings / scripts / makefiles accordingly. Here are the git commands you need to switch the branch: You have no committed changes: 1.) git-fetch origin (to get the new branches and objects) 2a.) git-checkout -b org.openmoko.asu.dev origin/org.openmoko.asu.dev 2b.) git-checkout -b org.openmoko.asu.stable origin/org.openmoko.asu.stable 3.) git-branch will tell you that you are on the stable branch now and git-pull will track that. 4.) git-checkout org.openmoko.asu.dev (will switch to the dev branch) You have committed but not pushed changes: 1.) git-fetch origin (to get the new branches and objects) 2a.) git-checkout -b org.openmoko.asu.dev (this will create a branch from your current state) 2b.) git-checkout -b org.openmoko.asu.stable origin/org.openmoko.asu.stable 3.) git-checkout org.openmoko.asu.dev 4.) git-rebase origin/org.openmoko.asu.dev 5.) git-push Greetings, Marek
