Gaia/UX Branch/Maintenance

From MozillaWiki
Jump to navigation Jump to search

Commits Merged into UX Branch

Reverse-chronological.

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
 * Tag bug with 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.
  • 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][prcommits].
 * Issue pull request.

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 using git patch instead of pull requests.

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=493172"