Sheriffing/How To/Uplifts

From MozillaWiki
< Sheriffing
Revision as of 15:33, 21 May 2015 by RyanVM (talk | contribs) (Create page with basic topics to be covered)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search

Standard practice is that bug fixes that affect the release branches must first land on trunk/master. Unless there is a branch-specific patch attached to the bug, the patch that landed must then be transplanted to the appropriate branches. This page documents the procedure for performing those uplifts for both Gecko and Gaia.

Bug Queries

Gecko Uplifts

Using Separate Repositories

By default, the different Gecko branches live in different repositories.

Using A Unified Repository

When using the Firefoxtree extension, all the Gecko releases live in the same repository.

Gaia Uplifts

Git has built-in tools for performing transplants, via the cherry-pick function. Since all Gaia branches live in the same repository, we can use that.