Gaia/UX Branch/Maintenance

From MozillaWiki
< Gaia‎ | UX Branch
Revision as of 18:01, 11 December 2012 by Gbrander (talk | contribs) (→‎Process)
Jump to navigation Jump to search

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
    • Make sure commit has bug number. Check 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.
Retrieved from "https://wiki.allizom.org/index.php?title=Gaia/UX_Branch/Maintenance&oldid=493187"