Skip to content
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

Missing f prefix on f-strings fix #6718

Merged

Conversation

code-review-doctor
Copy link
Contributor

Fixes #6717

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.8 labels Apr 25, 2022
@Dreamsorcerer Dreamsorcerer enabled auto-merge (squash) April 25, 2022 18:53
@Dreamsorcerer Dreamsorcerer merged commit 0215cdd into aio-libs:master Apr 25, 2022
@patchback
Copy link
Contributor

patchback bot commented Apr 25, 2022

Backport to 3.8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0215cdd on top of patchback/backports/3.8/0215cdd4275ea0150f169545b25b66e1f5dc69f0/pr-6718

Backporting merged PR #6718 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.8/0215cdd4275ea0150f169545b25b66e1f5dc69f0/pr-6718 upstream/3.8
  4. Now, cherry-pick PR Missing f prefix on f-strings fix #6718 contents into that branch:
    $ git cherry-pick -x 0215cdd4275ea0150f169545b25b66e1f5dc69f0
    If it'll yell at you with something like fatal: Commit 0215cdd4275ea0150f169545b25b66e1f5dc69f0 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 0215cdd4275ea0150f169545b25b66e1f5dc69f0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Missing f prefix on f-strings fix #6718 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/0215cdd4275ea0150f169545b25b66e1f5dc69f0/pr-6718
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link
Contributor

patchback bot commented Apr 25, 2022

Backport to 3.9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0215cdd on top of patchback/backports/3.9/0215cdd4275ea0150f169545b25b66e1f5dc69f0/pr-6718

Backporting merged PR #6718 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.9/0215cdd4275ea0150f169545b25b66e1f5dc69f0/pr-6718 upstream/3.9
  4. Now, cherry-pick PR Missing f prefix on f-strings fix #6718 contents into that branch:
    $ git cherry-pick -x 0215cdd4275ea0150f169545b25b66e1f5dc69f0
    If it'll yell at you with something like fatal: Commit 0215cdd4275ea0150f169545b25b66e1f5dc69f0 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 0215cdd4275ea0150f169545b25b66e1f5dc69f0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Missing f prefix on f-strings fix #6718 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/0215cdd4275ea0150f169545b25b66e1f5dc69f0/pr-6718
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing f prefix on f-strings
2 participants