Versions Compared

Old Version 7

changes.mady.by.user Raphael 'kena' Poss

Saved on

compared with

New Version Current

changes.mady.by.user Raphael 'kena' Poss

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • Double check the PR is eligible for backport as per this linked page.

  • Verify that the backport PR does not add a cluster version nor a version gate.
    (i.e. it does not make changes to pkg/clusterversion/cockroach_versions.go nor does it contain checks that compare the current version to one of the newer versions.)
    Ask on #engineering if you need details about why backports must never add cluster versions or version gates.

  • Check the release notes in the commit messages, to ensure they are applicable to the branch (if a release note refers to another change / PR that is not being backported, or that may be backported later, suggest a rephrasing.)

...

  1. Make sure the backport tool is installed: go get install github.com/benesch/backportbackport@latest

    1. For first time setup, you will need to set the cockroach.remote git config option. If your fork of cockroach is in the remote named origin, then set it with git config cockroach.remote origin while in your local cockroach git repo.

  2. Run backport -r VV.V xxxxx, where VV.V is replaced by the version number of the release branch and xxxxx is replaced by the GitHub PR number of the PR you are trying to backport, or a space-separated list of PR numbers.
    This will automatically create a backport branch and upload it to your repository against the release branch to GitHub.
    Then, it will try to open your browser to create a new PR with that branch, or provide instruction on how to do this manually if it cannot open your browser.

    1. If there were merge conflicts, backport will halt and ask you to fix them. Once they're fixed, run backport --continue to continue the procedure.

    2. If there were any non-trivial merge conflicts, be sure to call those out in the PR message so reviewers can pay closer attention to the diff.

    3. If something goes wrong, you can use backport --abort to give up on the current manual backport.

Note: You do not need to use bors to merge a backport PR; just hit the big green button once the CI is green and the backport is approved by the reviewer (usually the main reviewer of the original PR to master branch).