| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 4cf17ed commit eb2d75d
1 file changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -179,7 +179,7 @@ fixed upstream first. | |||
| 179 | 179 | ### Backporting to active branches | |
| 180 | 180 | ||
| 181 | 181 | If the bug exists in any of the active V8 branches, we may need to get the fix | |
| 182 | - backported. At any given time there are [two active branches][V8ActiveBranches] | ||
| 182 | + backported. At any given time, there are [two active branches][V8ActiveBranches] | ||
| 183 | 183 | (beta and stable) in addition to master. The following steps are needed to | |
| 184 | 184 | backport the fix: | |
| 185 | 185 | ||
@@ -191,9 +191,7 @@ backport the fix: | |||
| 191 | 191 | * If a bug already exists | |
| 192 | 192 | * Add a reference to the GitHub issue. | |
| 193 | 193 | * Attach *merge-request-x.x* labels to the bug for any active branches | |
| 194 | - that still contain the bug. (e.g. merge-request-5.3, | ||
| 195 | - merge-request-5.4) | ||
| 196 | - * Add ofrobots-at-google.com to the cc list. | ||
| 194 | + that still contain the bug. | ||
| 197 | 195 | * Once the merge has been approved, it should be merged using the | |
| 198 | 196 | [merge script documented in the V8 wiki][V8MergingPatching]. Merging requires | |
| 199 | 197 | commit access to the V8 repository. If you don't have commit access you can | |
@@ -246,8 +244,7 @@ fix needed to be cherry-picked. To cherry-pick, here's an example workflow: | |||
| 246 | 244 | not apply cleanly. It may help to try to cherry-pick the merge to the oldest | |
| 247 | 245 | branch that was done upstream in V8. In this example, this would be the patch | |
| 248 | 246 | from the merge to 5.2. The hope is that this would be closer to the V8 5.1, | |
| 249 | - and has a better chance of applying cleanly. If you're stuck, feel free to | ||
| 250 | - ping @ofrobots for help. | ||
| 247 | + and has a better chance of applying cleanly. | ||
| 251 | 248 | * Modify the commit message to match the format we use for V8 backports and | |
| 252 | 249 | replace yourself as the author. `git commit --amend --reset-author`. You may | |
| 253 | 250 | want to add extra description if necessary to indicate the impact of the fix | |
| Back | FazBrowse Home | New Git URL |
0 commit comments