Plasma/IntegrationBranches/GeneralPolicy: Difference between revisions
< Plasma
Line 10: | Line 10: | ||
* Whenever a bug fix is implemented in a branch (tracked via bugs.kde.org in the appropriate product), that branch will be merged within a day or two (or Monday, if that is sooner) | * Whenever a bug fix is implemented in a branch (tracked via bugs.kde.org in the appropriate product), that branch will be merged within a day or two (or Monday, if that is sooner) | ||
* After a minimum of 1 week, and when the branch passes testing in integration, it will be merged into master. | * After a minimum of 1 week, and when the branch passes testing in integration, it will be merged into master. | ||
==Wiki Pages== | |||
This wiki page describes the general workflow for specific informations like | |||
* the mailing list | |||
* the product name in bugs.kde.org | |||
*the Current Branches Section and theRequested But Not Yet Merged | |||
visit the appropriate wiki page | |||
== Current Branches == | == Current Branches == |
Revision as of 11:37, 8 March 2013
Workflow
The workflow is as follows:
- When you create a new branch add it to the current branches
- To get a branch added to integration, edit this page and add it in the Requested But Not Yet Merged section.
- This should be followed by an email to the specific mailing list explaining what is in the branch so everyone can watch for it in integration. The email should contain:
- What the branch does (functionality, bug fixes, etc)
- What needs QA and user testing
- Every Monday morning, all branches are merged into integration.
- Whenever a bug fix is implemented in a branch (tracked via bugs.kde.org in the appropriate product), that branch will be merged within a day or two (or Monday, if that is sooner)
- After a minimum of 1 week, and when the branch passes testing in integration, it will be merged into master.
Wiki Pages
This wiki page describes the general workflow for specific informations like
- the mailing list
- the product name in bugs.kde.org
- the Current Branches Section and theRequested But Not Yet Merged
visit the appropriate wiki page
Current Branches
- origin/orientation
- origin/rcg/imageviewer