I keep forgetting this and relearning how to do it.
-
apply patch from bug
-
go to bug 1346825
-
find the build system commit (currently attachment 8855871)
-
just apply the raw diff locally to the various files (for whatever reason, I often find
patch
barfs on the diff) -
commit the changes locally
-
-
extract addon code from local git repo into local mozilla repo
-
make sure the local copy of Screenshots is up-to-date
-
incantation:
EXPORT_MC_LOCATION=/Users/jhirsch/codez/mozilla/git-gecko make export_addon
-
-
apply bug fix patches in local mozilla repo (just use the reflog to find SHAs, and cherry-pick) (these are my local git-cinnabar SHAs, and don't correspond to the hg commits)
-
4ff930911f (context menu test fix)
-
8512525b52 (CUI defaults list)
-
5129cf62df (linter fix)
-
d3030c5483 (fix CUI defaults order)
-
-
push to try via
./mach try -b o -p linux64,macosx64,win64 -u mochitest-bc -t none
for BC tests, or-u all
to run all the tests (including dom tests, which have been re-breaking lately)