MozillaWiki

Gaia/UX Branch/Maintenance: Difference between revisions

< Gaia‎ | UX Branch
 
(10 intermediate revisions by 2 users not shown)
Line 3: Line 3:
Merged with master:
Merged with master:


* ux-2013-01-04-cherry-picked
* ux-2012-12-28-cherry-picked
* ux-2012-12-21-cherry-picked
* ux-2012-12-14-cherry-picked
* ux-2012-11-29-cherry-picked
* ux-2012-11-29-cherry-picked
* ux-2012-11-22-cherry-picked


== Process ==
== Process ==


* Update UX Branch Daily
* Update the UX Branch Daily by fetching and merging from upstream/master
* Review pull requests 2-3 times a week
* Review pull requests 2-3 times a week
** Make sure commit has bug number. Check bug in Bugzilla.
** Check bug in Bugzilla.
** Special priority for commits that address bugs in this list: http://bit.ly/TE1jzg
** 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!
** 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
** 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. Then, in Bugzilla:
** 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"'''
** Add Status Whiteboard "landed in uxbranch"
*** '''Add a link to the commit in your comment'''
* Create a pull request for qa-verified bugs every week.
* Create a pull request for [https://bugzilla.mozilla.org/buglist.cgi?type0-1-0=substring&list_id=5024470&field0-1-0=status_whiteboard&field0-0-0=status_whiteboard&query_format=advanced&value0-1-0=qa-verified&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=READY&bug_status=ASSIGNED&bug_status=REOPENED&type0-0-0=substring&value0-0-0=landed%20in%20uxbranch&product=Boot2Gecko 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.
** 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.
** 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.
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 it makes sense to use git patch instead of merging a pull request.
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.


When patching, use this format:
== Bugzilla ==
 
    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.


* [https://bugzilla.mozilla.org/buglist.cgi?list_id=5022636;status_whiteboard_type=allwordssubstr;query_format=advanced;status_whiteboard=uxbranch;product=Boot2Gecko Status Whiteboard: uxbranch] all bugs targeted for, or merged into UX Branch
* [https://bugzilla.mozilla.org/buglist.cgi?list_id=5022636;status_whiteboard_type=allwordssubstr;query_format=advanced;status_whiteboard=uxbranch;product=Boot2Gecko Status Whiteboard: uxbranch] all bugs targeted for, or merged into UX Branch

Latest revision as of 23:25, 7 January 2013

Pull Requests

Merged with master:

  • ux-2013-01-04-cherry-picked
  • ux-2012-12-28-cherry-picked
  • ux-2012-12-21-cherry-picked
  • ux-2012-12-14-cherry-picked
  • ux-2012-11-29-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. Then, in Bugzilla:
      • Add Status Whiteboard "landed in uxbranch"
      • Add a link to the commit in your comment
  • 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

Retrieved from "https://wiki.allizom.org/index.php?title=Gaia/UX_Branch/Maintenance&oldid=497034"