Plasma/IntegrationBranches/GeneralPolicy: Difference between revisions
< Plasma
| Line 2: | Line 2: | ||
The workflow is as follows: | 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. | * 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 | * 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 the branch does (functionality, bug fixes, etc) | ||
** What needs QA and user testing | ** What needs QA and user testing | ||
* Every Monday morning, all branches are merged into integration. | * 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 | * 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. | ||
Revision as of 11:34, 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.
Current Branches
- origin/orientation
- origin/rcg/imageviewer