morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project /
Applications / Tor Browser
Commits:
abf26895 by Morgan at 2025-08-27T18:08:38+00:00
fixup! TB 43616: Customize Gitlab Issue and Merge Request templates
Bug 43534: Update rebase template
- - - - -
943e9e70 by Morgan at 2025-08-27T18:08:45+00:00
fixup! BB 43615: Add Gitlab Issue and Merge Request templates
Bug 43534: Update rebase templates
- - - - -
3 changed files:
- .gitlab/issue_templates/060 Rebase - Alpha.md
- .gitlab/issue_templates/061 Rebase - Stable.md
- .gitlab/issue_templates/062 Rebase - Legacy.md
Changes:
=====================================
.gitlab/issue_templates/060 Rebase - Alpha.md
=====================================
@@ -99,6 +99,8 @@
- **TOR FEATURES** - new tor-specific functionality: manual,
onion-location, onion service client auth, etc
- [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN`
tag
- **Example**: `git cherry-pick
tor-browser-102.7.0esr-12.5-1-build1..upstream/tor-browser-102.7.0esr-12.5-1`
+ - [ ] Rebase and `pick` new security backport patches to the end of the
**MOZILLA BACKPORTS** section of the commit history
+ - **Example**: `git rebase --interactive FIREFOX_102_8_0esr_RELEASE`
- [ ] Rebase and autosquash again, this time replacing all `fixup` and
`squash` commands with `pick`. The goal here is to have all of the `fixup` and
`squash` commits beside the commit which they modify, but kept un-squashed for
easy debugging/bisecting.
- **Example**: `git rebase --autosquash --interactive
FIREFOX_102_8_0esr_RELEASE`
- [ ] Compare patch sets to ensure nothing *weird* happened during conflict
resolution:
=====================================
.gitlab/issue_templates/061 Rebase - Stable.md
=====================================
@@ -74,6 +74,8 @@
- **Example**: `git rebase --autosquash --interactive
FIREFOX_102_8_0esr_RELEASE`
- [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN`
tag
- **Example**: `git cherry-pick
tor-browser-102.7.0esr-12.0-1-build1..upstream/tor-browser-102.7.0esr-12.0-1`
+ - [ ] Rebase and `pick` new security backport patches to the end of the
**MOZILLA BACKPORTS** section of the commit history
+ - **Example**: `git rebase --interactive FIREFOX_102_8_0esr_RELEASE`
- [ ] Rebase and autosquash again, this time replacing all `fixup` and
`squash` commands with `pick`. The goal here is to have all of the `fixup` and
`squash` commits beside the commit which they modify, but kept un-squashed for
easy debugging/bisecting.
- **Example**: `git rebase --autosquash --interactive
FIREFOX_102_8_0esr_RELEASE`
- [ ] Compare patch sets to ensure nothing *weird* happened during conflict
resolution:
=====================================
.gitlab/issue_templates/062 Rebase - Legacy.md
=====================================
@@ -57,6 +57,8 @@
- **Example**: `git rebase --autosquash --interactive
FIREFOX_115_18_0esr_BUILD1`
- [ ] Cherry-pick remainder of patches after the last `tor-browser` `build1`
tag
- **Example**: `git cherry-pick
tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1`
+ - [ ] Rebase and `pick` new security backport patches to the end of the
**MOZILLA BACKPORTS** section of the commit history
+ - **Example**: `git rebase --interactive FIREFOX_115_18_0esr_BUILD1`
- [ ] Rebase and autosquash again, this time replacing all `fixup` and
`squash` commands with `pick`. The goal here is to have all of the `fixup` and
`squash` commits beside the commit which they modify, but kept un-squashed for
easy debugging/bisecting.
- **Example**: `git rebase --autosquash --interactive
FIREFOX_115_18_0esr_BUILD1`
- [ ] Compare patch sets to ensure nothing *weird* happened during conflict
resolution:
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c83c49f7197feb38fa9912b7c8fec6fd346db7a8...943e9e706e49e59df1a29877a66ce9788e6831bc
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c83c49f7197feb38fa9912b7c8fec6fd346db7a8...943e9e706e49e59df1a29877a66ce9788e6831bc
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
