5 ms·

https://wiki.mozilla.org/Release_Management/Uplift_rules https://wiki.mozilla.org/Release_Management/Uplift_rules

by mburns 10y ago

akavel 10y ago
Truth said, I can't find an explanation/definition of what actually an "uplift" means there?
- gsnedders 10y ago
  Typically landing a patch on a release branch, "uplifting" it from the main development branch (but occasionally uplifting it from thin air into the release branch).
- leojackson 10y ago
  It looks like this page is designed for people who already know what an "uplift" is, but wish to implement it properly. That being said, it also appears that "uplifts" will include bug fixes made in Tor Browser and sent upstream to Firefox, rather than just features added (but disabled by default) as was implied in the OP article. I would have assumed that bug fixes made in a downstream product would already have a mechanism to find their way to Firefox. Maybe "uplift" was the term all along for that mechanism, or is a rebranding of it?
  - selenamarie 10y ago
    Uplift to us is bringing the patches into mozilla-central pref'd off so that Tor developers can just pref features on, rather than re-merge patches for each major and dot release. We also add tend to add tests.
hsivonen 10y ago
That page doesn't explain the use of "uplift" to mean what's commonly called "upstreaming". That page refers to "uplift" meaning a patch being added to an older Firefox branch ahead of normal whole-branch promotion. (I.e. cherry pickin from the Nightly channel to Aurora, Beta or even Release ahead of Nightly as a whole becoming the new Aurora, etc.)
bzbarsky 10y ago
That's not the same thing. "uplift" for that page means "backport from development trunk to a more-stable branch".
- btown 10y ago
  Theoretically Tor Browser's fork is just another development branch of Firefox, just like Mozilla's primary development branch, and they are "uplifting/backporting" individual patches into stable the same way Mozilla might backport crucial dev-branch improvements/bugfixes into stable.
  - jgraham 10y ago
    But they aren't landing patches on "stable", but on the upstream development branch (i.e. mozilla-inbound/central). Since it seems more reasonable to view tor browser as a release branch of firefox than as a development branch, it seems like they are using "uplift" in the opposite sense to the normal Mozilla usage i.e. they are taking a patch from a product branch and moving it to a development branch. In that context "upstream" might indeed be a less confusing choice of words. On the other hand I think it's clear what they actually mean here, so probably not worth worry about too much.

https://wiki.mozilla.org/Release_Management/Uplift_rules https://wiki.mozilla.org/Release_Management/Uplift_rules

by mburns 10y ago

https://wiki.mozilla.org/Release_Management/Uplift_rules https://wiki.mozilla.org/Release_Management/Uplift_rules

akavel 10y ago

Truth said, I can't find an explanation/definition of what actually an "uplift" means there?

gsnedders 10y ago
Typically landing a patch on a release branch, "uplifting" it from the main development branch (but occasionally uplifting it from thin air into the release branch).
leojackson 10y ago
It looks like this page is designed for people who already know what an "uplift" is, but wish to implement it properly. That being said, it also appears that "uplifts" will include bug fixes made in Tor Browser and sent upstream to Firefox, rather than just features added (but disabled by default) as was implied in the OP article. I would have assumed that bug fixes made in a downstream product would already have a mechanism to find their way to Firefox. Maybe "uplift" was the term all along for that mechanism, or is a rebranding of it?
- selenamarie 10y ago
  Uplift to us is bringing the patches into mozilla-central pref'd off so that Tor developers can just pref features on, rather than re-merge patches for each major and dot release. We also add tend to add tests.

hsivonen 10y ago

That page doesn't explain the use of "uplift" to mean what's commonly called "upstreaming". That page refers to "uplift" meaning a patch being added to an older Firefox branch ahead of normal whole-branch promotion. (I.e. cherry pickin from the Nightly channel to Aurora, Beta or even Release ahead of Nightly as a whole becoming the new Aurora, etc.)

bzbarsky 10y ago

That's not the same thing. "uplift" for that page means "backport from development trunk to a more-stable branch".

btown 10y ago
Theoretically Tor Browser's fork is just another development branch of Firefox, just like Mozilla's primary development branch, and they are "uplifting/backporting" individual patches into stable the same way Mozilla might backport crucial dev-branch improvements/bugfixes into stable.
- jgraham 10y ago
  But they aren't landing patches on "stable", but on the upstream development branch (i.e. mozilla-inbound/central). Since it seems more reasonable to view tor browser as a release branch of firefox than as a development branch, it seems like they are using "uplift" in the opposite sense to the normal Mozilla usage i.e. they are taking a patch from a product branch and moving it to a development branch. In that context "upstream" might indeed be a less confusing choice of words. On the other hand I think it's clear what they actually mean here, so probably not worth worry about too much.