Plasma/IntegrationBranches/GeneralPolicy: Difference between revisions
< Plasma
| (4 intermediate revisions by one other user not shown) | |||
| Line 2: | Line 2: | ||
The workflow is as follows: | The workflow is as follows: | ||
* 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 the specific mailing list explaining what is in the branch so everyone can watch for it in integration. The email should contain: | * 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: | ||
| Line 10: | Line 9: | ||
* 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. | ||
'''NOTE:''' If you don't want to trigger the server side hooks with some keyword in your commit message | |||
keep the branch locally and push it after the review on the reviewboard. | |||
==Wiki Pages== | ==Wiki Pages== | ||
| Line 16: | Line 18: | ||
* the product name in bugs.kde.org | * the product name in bugs.kde.org | ||
*the Current Branches Section and theRequested But Not Yet Merged | *the Current Branches Section and theRequested But Not Yet Merged | ||
==Project that follow this Git Workflow== | |||
;[[Plasma/IntegrationBranches/plasmate|plasmate]] | |||
;[[Plasma/IntegrationBranches/plasma-mobile|plasma-mobile]] | |||
;[[Plasma/IntegrationBranches/bodega-server|bodega-server]] | |||
Latest revision as of 16:49, 12 April 2013
Workflow
The workflow is as follows:
- 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.
NOTE: If you don't want to trigger the server side hooks with some keyword in your commit message keep the branch locally and push it after the review on the reviewboard.
Wiki Pages
This wiki page describes the general workflow, visit the appropriate wiki page for specific informations like
- the mailing list
- the product name in bugs.kde.org
- the Current Branches Section and theRequested But Not Yet Merged