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.

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

doc: clarify fast-track of reversions #17332

Merged
merged 1 commit into from Nov 28, 2017

Conversation

@refack
Member

refack commented Nov 26, 2017

Checklist
Affected core subsystem(s)

doc,meta

@refack refack requested a review from joyeecheung Nov 26, 2017

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack Nov 26, 2017

Member

/CC @jasnell @gireeshpunathil @tniessen @mhdawson
Since this is a followup to #17056

Member

refack commented Nov 26, 2017

/CC @jasnell @gireeshpunathil @tniessen @mhdawson
Since this is a followup to #17056

Show outdated Hide outdated COLLABORATOR_GUIDE.md Outdated
@aqrln

aqrln approved these changes Nov 27, 2017

@targos

targos approved these changes Nov 27, 2017

@danbev

danbev approved these changes Nov 27, 2017

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins Nov 28, 2017

Member

was there a previous discussion around this regarding reverts? Is the idea that reverts are included in regressions?

Member

MylesBorins commented Nov 28, 2017

was there a previous discussion around this regarding reverts? Is the idea that reverts are included in regressions?

@addaleax

This comment has been minimized.

Show comment
Hide comment
@addaleax
Member

addaleax commented Nov 28, 2017

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins Nov 28, 2017

Member

it would seem that perhaps we want to be specific about them being recent regressions? Do we want to fast track any bug fix??

Member

MylesBorins commented Nov 28, 2017

it would seem that perhaps we want to be specific about them being recent regressions? Do we want to fast track any bug fix??

@targos

This comment has been minimized.

Show comment
Hide comment
@targos

targos Nov 28, 2017

Member

@MylesBorins your message made me think a little bit more about this. I agree we should be more specific because it should not be about fast-tracking any regression.
Here are the two situations that IMO justify fast-tracking:

  • Regressions that break contributor's workflow (like red CI, broken compilation)
  • Regressions that happen right before a release. If the fix is obvious -> fast track. Otherwise the commit introducing the regression can be backed out of the release branch.
Member

targos commented Nov 28, 2017

@MylesBorins your message made me think a little bit more about this. I agree we should be more specific because it should not be about fast-tracking any regression.
Here are the two situations that IMO justify fast-tracking:

  • Regressions that break contributor's workflow (like red CI, broken compilation)
  • Regressions that happen right before a release. If the fix is obvious -> fast track. Otherwise the commit introducing the regression can be backed out of the release branch.
@joyeecheung

This comment has been minimized.

Show comment
Hide comment
@joyeecheung

joyeecheung Nov 28, 2017

Member

@targos There is another type of fast-tracking that we do in practice: commits fixing regressions that have just been released and reported soon after the release. We usually do a quick release for them soon after they land.

Member

joyeecheung commented Nov 28, 2017

@targos There is another type of fast-tracking that we do in practice: commits fixing regressions that have just been released and reported soon after the release. We usually do a quick release for them soon after they land.

@@ -127,7 +127,7 @@ can be fast-tracked and may be landed after a shorter delay:
* Focused changes that affect only documentation and/or the test suite.
`code-and-learn` and `good-first-issue` pull requests typically fall
into this category.
* Changes that revert commit(s) and/or fix regressions.
* Changes that fix regressions.

This comment has been minimized.

@joyeecheung

joyeecheung Nov 28, 2017

Member

It would be better if we include the cases listed by @targos and in #17332 (comment) here.

@joyeecheung

joyeecheung Nov 28, 2017

Member

It would be better if we include the cases listed by @targos and in #17332 (comment) here.

@mhdawson

LGTM

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack Nov 28, 2017

Member

I'd rather we land this first, since it's small and focused change, with wide approval, and continue iterating later.
Also this is not the entire language of this section, fast tracking a PR still requires the discretion and consensus of at least 3 people.

Member

refack commented Nov 28, 2017

I'd rather we land this first, since it's small and focused change, with wide approval, and continue iterating later.
Also this is not the entire language of this section, fast tracking a PR still requires the discretion and consensus of at least 3 people.

doc: clarify fast-track of reversions
PR-URL: #17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

@refack refack merged commit 41c45fd into nodejs:master Nov 28, 2017

@refack refack referenced this pull request Nov 28, 2017

Closed

doc: examples for fast-tracking regression fixes #17379

2 of 2 tasks complete
@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack Nov 28, 2017

Member

follow up on comments is in #17379

Member

refack commented Nov 28, 2017

follow up on comments is in #17379

@refack refack added the meta label Nov 28, 2017

@refack refack removed the author ready label Nov 28, 2017

MylesBorins added a commit that referenced this pull request Dec 12, 2017

doc: clarify fast-track of reversions
PR-URL: #17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

MylesBorins added a commit that referenced this pull request Dec 12, 2017

doc: clarify fast-track of reversions
PR-URL: #17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

@MylesBorins MylesBorins referenced this pull request Dec 12, 2017

Merged

v9.3.0 proposal #17631

gibfahn added a commit that referenced this pull request Dec 19, 2017

doc: clarify fast-track of reversions
PR-URL: #17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

gibfahn added a commit that referenced this pull request Dec 19, 2017

doc: clarify fast-track of reversions
PR-URL: #17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

@gibfahn gibfahn referenced this pull request Dec 20, 2017

Closed

v8.9.4 proposal #17772

gibfahn added a commit that referenced this pull request Dec 20, 2017

doc: clarify fast-track of reversions
PR-URL: #17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

@gibfahn gibfahn referenced this pull request Dec 20, 2017

Merged

v8.9.4 proposal #17774

@MylesBorins MylesBorins referenced this pull request Dec 20, 2017

Merged

v6.12.3 proposal #17776

msoechting added a commit to hpicgs/node that referenced this pull request Feb 5, 2018

doc: clarify fast-track of reversions
PR-URL: nodejs#17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

msoechting added a commit to hpicgs/node that referenced this pull request Feb 7, 2018

doc: clarify fast-track of reversions
PR-URL: nodejs#17332
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment