Rebase Tor Browser Alpha to 102.10.0esr
NOTE: All examples reference the rebase from 102.7.0esr to 102.8.0esr
Explanation of Variables
- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - example : `102.8.0` - `(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `
(ESR_VERSION)`
- example : `FIREFOX_102_8_0esr_RELEASE`
- `$(ESR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from)
- `$(BROWSER_MAJOR)` : the browser major version
- example : `12`
- `$(BROWSER_MINOR)` : the browser minor version
- example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
- `$(BASE_BROWSER_BRANCH)` : the full name of the current `base-browser` branch
- example: `base-browser-102.8.0esr-12.5-1`
- `$(BASE_BROWSER_BRANCH_PREV)` : the full name of the previous `base-browser` branch
- example: `base-browser-102.7.0esr-12.5-1`
- `$(TOR_BROWSER_BRANCH)` : the full name of the current `tor-browser` branch
- example: `tor-browser-102.8.0esr-12.5-1`
- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous `tor-browser` branch
- example: `tor-browser-102.7.0esr-12.5-1`
NOTE: It is assumed that we've already identified the new esr branch during the tor-browser stable rebase
Bookkeeping
-
Link this issue to the appropriate Release Prep issue.
Rebase base-browser
-
Checkout a new branch for the base-browser
rebase- example:
git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1
- example:
-
Cherry-pick the previous base-browser
commits up tobase-browser
'sbuild1
tag onto newbase-browser
rebase branch- example:
git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1
- example:
-
Rebase and autosquash these cherry-picked commits - example:
git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD
- example:
-
Cherry-pick remainder of patches after the build1
tag- example:
git cherry-pick base-browser-102.7.0esr-12.5-1-build1 origin/base-browser-102.7.0esr-12.5-1
- example:
-
Compare patch sets to ensure nothing weird happened during conflict resolution: -
diff of diffs: - Do the diff between
current_patchset.diff
andrebased_patchset.diff
with your preferred difftool and look at differences on lines that starts with + or - git diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) > current_patchset.diff
git diff $(ESR_TAG)..$(BASE_BROWSER_BRANCH) > rebased_patchset.diff
- diff
current_patchset.diff
andrebased_patchset.diff
- If everything went correctly, the only lines which should differ should be the lines starting with
index abc123...def456
- If everything went correctly, the only lines which should differ should be the lines starting with
- Do the diff between
-
rangediff: git range-diff $(ESR_TAG_PREV)..$(BASE_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD
- example:
git range-dif FIREFOX_102_7_0esr_BUILD1..origin/base-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD
- example:
-
-
Open MR for the base-browser
rebase -
Merge -
Sign/Tag HEAD of the merged new base-browser
branch:- Tag :
base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1
- Message :
Tagging build1 for $(ESR_VERSION)esr-based alpha
- Tag :
-
Push tag to origin
Rebase tor-browser
-
Checkout a new branch for the tor-browser
rebase starting from thebase-browser
build1
tag- example:
git branch tor-browser-rebase base-browser-102.8.0esr-12.5-1-build1
- example:
-
Cherry-pick the previous tor-browser
commits frombase-browser
's previousbuild1
tag up totor-browser
's newestbuildN
tag (not necessarilybuild1
if we have multiple build tags)- example:
git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1
- example:
-
Rebase and autosquash these cherry-picked commits (from the last new base-browser
commit toHEAD
)- example:
git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD
- example:
-
Cherry-pick remainder of patches after the last buildN
tag- example:
git cherry-pick base-browser-102.7.0esr-12.5-1-build1..origin/tor-browser-102.7.0esr-12.5-1
- example:
-
Compare patch sets to ensure nothing weird happened during conflict resolution: -
diff of diffs: - Do the diff between
current_patchset.diff
andrebased_patchset.diff
with your preferred difftool and look at differences on lines that starts with + or - git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff
git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff
- diff
current_patchset.diff
andrebased_patchset.diff
- If everything went correctly, the only lines which should differ should be the lines starting with
index abc123...def456
- If everything went correctly, the only lines which should differ should be the lines starting with
- Do the diff between
-
rangediff: git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD
- example:
git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD
- example:
-
-
Open MR for the tor-browser
rebase -
Merge -
Sign/Tag HEAD of the merged new tor-browser
branch:- Tag :
tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1
- Message :
Tagging build1 for $(ESR_VERSION)esr-based alpha
- Tag :
-
Push tag to origin
Edited by morgan