git uplift

gistfile1.txt

// Make sure the repository is up to date with upstream
(env) ryanvm@ubuntu:~/repos/firefox$ git checkout main && git pull
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Already up to date.


// Create a new local beta-uplift branch tracking the upstream beta branch
(env) ryanvm@ubuntu:~/repos/firefox$ git checkout -b beta-uplift --track origin/beta
Updating files: 100% (4058/4058), done.
branch 'beta-uplift' set up to track 'origin/beta'.
Switched to a new branch 'beta-uplift'


// Sanity check just showing that we're on the expected head before we start cherry-picking
(env) ryanvm@ubuntu:~/repos/firefox$ git log
commit 41d799eea2c1813b1299f78a16b80d7c938b7438 (HEAD -> beta-uplift, origin/beta)


// Cherry-picking a commit I want to uplift, can be repeated as needed
// To look up the git hash, either run the `git log --grep="bug#"` command on your local
// clone from the main branch, look it up in the upstream GitHub repo, or check the
// "git commit" field on hgweb for a given revision:
// https://hg-edge.mozilla.org/mozilla-central/rev/<hg_hash>
(env) ryanvm@ubuntu:~/repos/firefox$ git cherry-pick 147cebe99eceb120569a527cf9cac9a70b497645
[beta-uplift f77f699f7417] Bug 1963705 - Update libpixman to release 0.46.0. r=jfkthame
 Date: Fri May 2 13:58:19 2025 +0000
 21 files changed, 3807 insertions(+), 1228 deletions(-)
 create mode 100644 gfx/cairo/libpixman/src/pixman-region64f.c
 delete mode 100644 gfx/cairo/pixman-neon.patch


// Another sanity check showing the cherry-picked commit(s) on top of the upstream origin/beta
(env) ryanvm@ubuntu:~/repos/firefox$ git log
commit f77f699f7417fc0419270bffd18c7ef573142f42 (HEAD -> beta-uplift)
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date:   Fri May 2 13:58:19 2025 +0000

    Bug 1963705 - Update libpixman to release 0.46.0. r=jfkthame
    
    Differential Revision: https://phabricator.services.mozilla.com/D247432

commit 41d799eea2c1813b1299f78a16b80d7c938b7438 (origin/beta)


// Run the actual moz-phab uplift command. The specified train is firefox-beta and the upstream to
// compare against is origin/beta. The --no-rebase command just avoids a warning about not being able to
// rebase the commit which we don't care about anyway.
(env) ryanvm@ubuntu:~/repos/firefox$ moz-phab uplift --train firefox-beta --upstream origin/beta --no-rebase
Determining the commit range using upstream "origin/beta"
Submitting 1 commit for review
(New) f77f699f7417 Bug 1963705 - Update libpixman to release 0.46.0.
Submit to https://phabricator.services.mozilla.com (YES/No/Always)?