Skip to content

doc: recommend git-node-v8 #43934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 4 commits into from
Jul 25, 2022
Merged

doc: recommend git-node-v8 #43934

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85c517f
doc: recommend git-node-v8
kvakil Jul 21, 2022
b88ea17
suggestions
kvakil Jul 21, 2022
5b61c66
oops; forgot format
kvakil Jul 21, 2022
ec65e9e
Update doc/contributing/maintaining-V8.md
kvakil Jul 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
suggestions
  • Loading branch information
@kvakil
kvakil committed Jul 21, 2022
commit b88ea178c8777977a6ce7fa88bbe5e3747d8afaf
21 changes: 11 additions & 10 deletions doc/contributing/maintaining-V8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,11 @@ backport the fix:
Abandoned V8 branches are supported in the Node.js repository. The fix needs
to be cherry-picked in the Node.js repository and V8-CI must test the change.

As an example for how to backport changes, consider the bug [RegExp show
inconsistent result with other browsers](https://crbug.com/v8/5199). From the
bug we can see that it was merged by V8 into 5.2 and 5.3, and not into V8 5.1
(since it was already abandoned). Since Node.js `v6.x` uses V8 5.1, the fix
needed to be backported.
As an example for how to backport changes, consider the bug
[RegExp show inconsistent result with other browsers](https://crbug.com/v8/5199).
From the bug we can see that it was merged by V8 into 5.2 and 5.3, and not into
V8 5.1 (since it was already abandoned). Since Node.js `v6.x` uses V8 5.1, the
fix needed to be backported.

#### Backporting with `git-node` (recommended)

Expand All @@ -227,9 +227,7 @@ Here are the steps for the bug mentioned above:
4. Checkout a branch off the appropriate _vY.x-staging_ branch (e.g.
_v6.x-staging_ to fix an issue in V8 5.1).
5. Run `git node v8 backport a51f429`.
6. If there are conflicts, `git-node` will wait for you to resolve them.
`git-node` will prompt you to resolve them in another terminal and then
enter `RESOLVED`:
6. If there are conflicts, `git-node` will wait for you to resolve them:

```console
$ git node v8 backport a51f429
Expand All @@ -245,6 +243,9 @@ $ git node v8 backport a51f429

? Resolve merge conflicts and enter 'RESOLVED' ‣
```
Resolve conflicts by opening another terminal and staging resolutions
to the merge conflicts. Once you fixed the conflicts, return to
`git-node` and enter `RESOLVED`.

7. After you resolve conflicts (or if there are no conflicts), the
output should look like this:
Expand All @@ -262,7 +263,7 @@ $ git node v8 backport a51f429

See [`git-node-v8-backport`][] for more documentation and additional options.

#### Backporting manually (not recommended)
#### Backporting manually

* For each abandoned V8 branch corresponding to an LTS branch that is affected
by the bug:
Expand Down Expand Up @@ -379,7 +380,7 @@ that Node.js may be floating (or else cause a merge conflict).

See [`git-node-v8-minor`][] for more documentation and additional options.

#### Applying minor updates manually (not recommended)
#### Applying minor updates manually

The rough outline of the process is:

Expand Down