Gaia/UX Branch/Maintenance: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
|||
| Line 1: | Line 1: | ||
== Pull Requests == | == Pull Requests == | ||
| Line 61: | Line 11: | ||
* Review pull requests 2-3 times a week | * Review pull requests 2-3 times a week | ||
* Open bug in Bugzilla | * Open bug in Bugzilla | ||
* | * Add Status Whiteboard "uxbranch" (if it doesn't have the tag already) | ||
* Review patch, understand risk-level of patch | * Review patch, understand risk-level of patch | ||
* Apply patch locally and test on-device | * Apply patch locally and test on-device | ||
* If all is OK, merge pull request. | * If all is OK, merge pull request. | ||
* Only one commit per fix! Make sure commit has bug # and details. If necessary, apply as patch and fix commit message. | * Only one commit per fix! Make sure commit has bug # and details. If necessary, apply as patch and fix commit message. | ||
* Add Status Whiteboard "landed in uxbranch" | |||
* Create a pull request for qa-verified bugs every week. | * Create a pull request for qa-verified bugs every week. | ||
* Cherry pick | * Cherry pick commits verified by QA and merged into UX, but not yet in master. Prefer cherry-picking the original commit instead of the merge commit. | ||
* Issue pull request. | * Issue pull request. | ||
* Include links to bugs in pull request message. | |||
Good news: cherry pick should fail noisily if it can't merge properly. | Good news: cherry pick should fail noisily if it can't merge properly. | ||
Note: you can get the original commit for a merge by clicking on the right-hand parent commit. | Note: you can get the original commit for a merge by clicking on the right-hand parent commit. | ||
== Patching == | == Patching == | ||
To keep commit history clean, sometimes | To keep commit history clean, sometimes it makes sense to use git patch instead of merging a pull request. | ||
When patching, use this format: | When patching, use this format: | ||
Revision as of 17:56, 11 December 2012
Pull Requests
Merged with master:
- ux-2012-11-29-cherry-picked
- ux-2012-11-22-cherry-picked
Process
- Update UX Branch Daily
- Review pull requests 2-3 times a week
* Open bug in Bugzilla * Add Status Whiteboard "uxbranch" (if it doesn't have the tag already) * Review patch, understand risk-level of patch * Apply patch locally and test on-device * If all is OK, merge pull request. * Only one commit per fix! Make sure commit has bug # and details. If necessary, apply as patch and fix commit message. * Add Status Whiteboard "landed in uxbranch"
- Create a pull request for qa-verified bugs every week.
* Cherry pick commits verified by QA and merged into UX, but not yet in master. Prefer cherry-picking the original commit instead of the merge commit. * Issue pull request. * Include links to bugs in pull request message.
Good news: cherry pick should fail noisily if it can't merge properly. Note: you can get the original commit for a merge by clicking on the right-hand parent commit.
Patching
To keep commit history clean, sometimes it makes sense to use git patch instead of merging a pull request.
When patching, use this format:
Bug 123456 - Apply patch from f4fdd305b24ac62248f28ee7cebde966f4f3d804 From f4fdd305b24ac62248f28ee7cebde966f4f3d804 Mon Sep 17 00:00:00 2001 From: Joe Schmo <jschmo@hotmail.com> Date: Thu, 29 Nov 2012 12:45:52 -0500 Subject: [PATCH] Bug 813140 - Contacts iconography fix for contact details screen Bug 813140 - Contacts iconography fix for contact details screen This change fixes Bug 813140: [Gaia::Contacts] Contact Details page not using the latest iconography from Visual Design.
- Status Whiteboard: uxbranch all bugs targeted for, or merged into UX Branch
- Status Whiteboard: uxbranch, qa-verified all UX branch bugs that have been verified by QA
- Status Whiteboard: landed in uxbranch all bugs landed in UX Branch
- Status Whiteboard: uxbranch AND NOT qa-verified everything yet to be verified by QA
- Status Whiteboard: landed in uxbranch, qa-verified AND open candidates for merge with master