Gaia/UX Branch/Maintenance: Difference between revisions
Jump to navigation
Jump to search
(→Process: Update link to "long link") |
|||
| Line 11: | Line 11: | ||
* Review pull requests 2-3 times a week | * Review pull requests 2-3 times a week | ||
** Check bug in Bugzilla. | ** Check bug in Bugzilla. | ||
** Priority is given to commits that address | ** Priority is given to commits that address [https://bugzilla.mozilla.org/buglist.cgi?status_whiteboard_type=anywordssubstr;query_format=advanced;status_whiteboard=uxbranch%2C%20ux-branch;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=READY;bug_status=ASSIGNED;bug_status=REOPENED;component=Builds;component=Gaia;component=Gaia%3A%3ABluetooth%20File%20Transfer;component=Gaia%3A%3ABrowser;component=Gaia%3A%3ACalculator;component=Gaia%3A%3ACalendar;component=Gaia%3A%3ACamera;component=Gaia%3A%3AClock;component=Gaia%3A%3AContacts;component=Gaia%3A%3ACost%20Control;component=Gaia%3A%3ADialer;component=Gaia%3A%3AE-Mail;component=Gaia%3A%3AEverything.me;component=Gaia%3A%3AFirst%20Time%20Experience;component=Gaia%3A%3AFMRadio;component=Gaia%3A%3AGallery;component=Gaia%3A%3AHomescreen;component=Gaia%3A%3AKeyboard;component=Gaia%3A%3AMusic;component=Gaia%3A%3APDF%20Viewer;component=Gaia%3A%3ASettings;component=Gaia%3A%3ASMS;component=Gaia%3A%3ASystem;component=Gaia%3A%3ASystem%3A%3ALockscreen;component=Gaia%3A%3AVideo;component=General;component=Hardware;component=Vendcom;product=Boot2Gecko;list_id=5191974 bugs targeted for uxbranch] | ||
** Add Status Whiteboard "uxbranch" (if it doesn't have the tag already) | ** Add Status Whiteboard "uxbranch" (if it doesn't have the tag already) | ||
** Only one commit per fix! | ** Only one commit per fix! | ||
Revision as of 21:36, 11 December 2012
Pull Requests
Merged with master:
- ux-2012-11-29-cherry-picked
- ux-2012-11-22-cherry-picked
Process
- Update the UX Branch Daily by fetching and merging from upstream/master
- Review pull requests 2-3 times a week
- Check bug in Bugzilla.
- Priority is given to commits that address bugs targeted for uxbranch
- Add Status Whiteboard "uxbranch" (if it doesn't have the tag already)
- Only one commit per fix!
- Make sure commit message is in correct format and has a bug number. If commit message is incorrect, we must make sure to fix it when we cherry-pick the commit at the end of the week (see below). If necessary, apply as patch and fix commit message.
- Review patch, understand risk-level of patch
- Apply patch locally and test on-device
- If all is OK, merge pull request.
- Add Status Whiteboard "landed in uxbranch"
- Create a pull request for landed, 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.
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 git am to preserve the original commit details.
Bugzilla
- 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