Skip to content

Rebase Fenix patches to 96.3.0

status

  • checkout the torbrowser-* branch from the old version (in this case tor-browser-94.1.1-11.5-1)[1]
  • create a new branch for this rebase: git checkout -b bug_40205
  • rebase on the new mozilla commit: git rebase -i --autosquash v96.2.0
  • check the list of commits to rebase, excluding extra moz commit. [2]
  • perform rebase, resolve merge conflicts
  • generate toolchain updates in tb-build with make list-toolchain-updates-fenix
  • generate gradle dependency updates in tb-build by following torbrowser-build/doc/how-to-create-gradle-dependencies-list.txt
  • run build w/ toolchain+gradle updates [3]
  • manually test apk

notes

  • [1] this branch can be discovered if it has not yet been created by grepping git_branch in torbrowser-build/projects/fenix/config at HEAD of master [sic]
  • [2] The first commit in the list should be a commit from us (not from mozilla). If the first commits are from mozilla, you should remove them,until the first commit from us (which is Bug 40002: Add GitLab CI).
  • [3] will likely need to work off of @pierov's WIP android-component branch with modifications discussed in tor-browser#40784 (closed) for this to work

context

Edited by aguestuser