morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser
Commits:
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:
| ... | ... | @@ -99,6 +99,8 @@ |
| 99 | 99 | - **TOR FEATURES** - new tor-specific functionality: manual, onion-location, onion service client auth, etc
|
| 100 | 100 | - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag
|
| 101 | 101 | - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.5-1-build1..upstream/tor-browser-102.7.0esr-12.5-1`
|
| 102 | + - [ ] Rebase and `pick` new security backport patches to the end of the **MOZILLA BACKPORTS** section of the commit history
|
|
| 103 | + - **Example**: `git rebase --interactive FIREFOX_102_8_0esr_RELEASE`
|
|
| 102 | 104 | - [ ] 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.
|
| 103 | 105 | - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE`
|
| 104 | 106 | - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|
| ... | ... | @@ -74,6 +74,8 @@ |
| 74 | 74 | - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE`
|
| 75 | 75 | - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag
|
| 76 | 76 | - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.0-1-build1..upstream/tor-browser-102.7.0esr-12.0-1`
|
| 77 | + - [ ] Rebase and `pick` new security backport patches to the end of the **MOZILLA BACKPORTS** section of the commit history
|
|
| 78 | + - **Example**: `git rebase --interactive FIREFOX_102_8_0esr_RELEASE`
|
|
| 77 | 79 | - [ ] 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.
|
| 78 | 80 | - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE`
|
| 79 | 81 | - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|
| ... | ... | @@ -57,6 +57,8 @@ |
| 57 | 57 | - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1`
|
| 58 | 58 | - [ ] Cherry-pick remainder of patches after the last `tor-browser` `build1` tag
|
| 59 | 59 | - **Example**: `git cherry-pick tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1`
|
| 60 | + - [ ] Rebase and `pick` new security backport patches to the end of the **MOZILLA BACKPORTS** section of the commit history
|
|
| 61 | + - **Example**: `git rebase --interactive FIREFOX_115_18_0esr_BUILD1`
|
|
| 60 | 62 | - [ ] 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.
|
| 61 | 63 | - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1`
|
| 62 | 64 | - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
|