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

Fix cancellations being swallowed #9030

Merged
merged 17 commits into from
Sep 23, 2024

Merge branch 'master' into fix-swallow-cancel

0b1bc0d
Select commit
Loading
Failed to load commit list.
Merged

Fix cancellations being swallowed #9030

Merge branch 'master' into fix-swallow-cancel
0b1bc0d
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.10 completed Sep 23, 2024 in 5s

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

❌ Failed to cleanly apply 1a77ad9 on top of patchback/backports/3.10/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030

Details

Backporting merged PR #9030 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.10/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030 upstream/3.10
  4. Now, cherry-pick PR #9030 contents into that branch:
    $ git cherry-pick -x 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e
    If it'll yell at you with something like fatal: Commit 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR #9030 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030
  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!