Visitar URL original
docs: require symbol-level attribution in the node upgrade skill by MarshallOfSound · Pull Request #53306 · electron/electron · GitHub
Skip to content

docs: require symbol-level attribution in the node upgrade skill - #53306

Merged
jkleinsc merged 1 commit into
mainfrom
docs/node-upgrade-skill-attribution
Aug 31, 2026
Merged

jkleinsc merged 1 commit into
mainfrom
docs/node-upgrade-skill-attribution

Conversation

@MarshallOfSound

Copy link
Copy Markdown
Member

Description of Change

Tightens the electron-node-upgrade skill so patch-fix commits on node roller branches cite the right upstream change.

  • references/phase-one-commit-guidelines.md: replace "use git log or git blame" with a required procedure. Name the symbol the fix touches, find its introducing commit with git log -S or git blame against refs/patches/upstream-head, verify that commit's diff contains the symbol, then take its PR-URL: and use its subject line verbatim as the title. Recency queries like git log -10 -- file are explicitly not attribution.
  • references/phase-one-commit-guidelines.md: new "Reuse Fixes From Sibling Roller Branches" section. Check roller/node/main and sibling roller/node/{N}-x-y branches for the same version first and reuse patch names, content, titles and refs verbatim.
  • references/patch-analysis.md: same procedure in the "Finding the Upstream Commit for a Change" section, and a note that the recent-history step is for orientation only.
  • references/phase-two-commit-guidelines.md: point at the phase-one procedure and the sibling-branch check.
  • SKILL.md: pre-flight item to look for the same roll on other branches.

Prompted by #53250, where the guard for ReadASN1Element was attributed to nodejs/node#64547 (the newest commit touching ncrypto.cc) instead of nodejs/node#64211 (the commit that added it), and where the same JSPI fix landed under a different patch name than on main and 43-x-y.

Checklist

  • PR description included and stakeholders cc'd
  • npm test passes
  • relevant documentation is changed or added
  • PR title follows semantic commit guidelines

Release Notes

Notes: none

A patch-fix commit on a node roller branch cited the wrong upstream PR
because the skill only said to "use git log or git blame" and the agent
picked the most recent commit touching the file rather than the commit
that introduced the symbol. Spell out the procedure: identify the
symbol, find its introducing commit with git log -S or git blame
against refs/patches/upstream-head, verify that commit's diff contains
the symbol, then take its PR-URL and subject line verbatim.

Also ask upgrades to check roller/node/main and sibling release-branch
rollers for the same version first and reuse those fixes verbatim, so
the same fix does not land under different patch names or attributions
on different branches.
@electron-cation electron-cation Bot added the new-pr 🌱 PR opened recently label Aug 29, 2026
@MarshallOfSound
MarshallOfSound marked this pull request as ready for review August 29, 2026 07:31
@MarshallOfSound
MarshallOfSound requested a review from a team as a code owner August 29, 2026 07:31
@MarshallOfSound MarshallOfSound added target/43-x-y PR should also be added to the "43-x-y" branch. target/44-x-y PR should also be added to the "44-x-y" branch. target/45-x-y PR should also be added to the "45-x-y" branch. labels Aug 29, 2026
@electron-cation electron-cation Bot removed the new-pr 🌱 PR opened recently label Aug 30, 2026
@jkleinsc
jkleinsc merged commit b87ecea into main Aug 31, 2026
82 checks passed
@release-clerk

release-clerk Bot commented Aug 31, 2026

Copy link
Copy Markdown

No Release Notes

@trop

trop Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

I have automatically backported this PR to "43-x-y", please check out #53322

@trop trop Bot added in-flight/43-x-y and removed target/43-x-y PR should also be added to the "43-x-y" branch. labels Aug 31, 2026
@trop

trop Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

I have automatically backported this PR to "45-x-y", please check out #53323

@trop

trop Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

I have automatically backported this PR to "44-x-y", please check out #53324

@trop trop Bot added in-flight/45-x-y in-flight/44-x-y merged/43-x-y PR was merged to the "43-x-y" branch. merged/45-x-y PR was merged to the "45-x-y" branch. and removed target/45-x-y PR should also be added to the "45-x-y" branch. target/44-x-y PR should also be added to the "44-x-y" branch. in-flight/43-x-y in-flight/45-x-y labels Aug 31, 2026
@trop trop Bot added merged/44-x-y PR was merged to the "44-x-y" branch. and removed in-flight/44-x-y labels Aug 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

46-x-y merged/43-x-y PR was merged to the "43-x-y" branch. merged/44-x-y PR was merged to the "44-x-y" branch. merged/45-x-y PR was merged to the "45-x-y" branch. semver/none

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

2 participants