Codecov Report

Merging #7577 (f5ae6da) into master (81c4de1) will increase coverage by 0.09%.
Report is 3 commits behind head on master.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #7577      +/-   ##
==========================================
+ Coverage   97.26%   97.35%   +0.09%     
==========================================
  Files         106      106              
  Lines       31485    31502      +17     
  Branches     2917     3586     +669     
==========================================
+ Hits        30623    30668      +45     
+ Misses        646      630      -16     
+ Partials      216      204      -12     

Flags with carried forward coverage won't be shown. Click here to find out more.

... and 10 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

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

❌ Failed to cleanly apply 9c932f7 on top of patchback/backports/3.8/9c932f71ec5a450954cee92ff9450974414ac1d8/pr-7577

Backporting merged PR #7577 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/9c932f71ec5a450954cee92ff9450974414ac1d8/pr-7577 upstream/3.8

4. Now, cherry-pick PR CookieJar - return 'best-match' and not LIFO #7577 contents into that branch:

   $ git cherry-pick -x 9c932f71ec5a450954cee92ff9450974414ac1d8

   If it'll yell at you with something like fatal: Commit 9c932f71ec5a450954cee92ff9450974414ac1d8 is a merge but no -m option was given., add -m 1 as follows instead:

   $ git cherry-pick -m1 -x 9c932f71ec5a450954cee92ff9450974414ac1d8

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR CookieJar - return 'best-match' and not LIFO #7577 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/3.8/9c932f71ec5a450954cee92ff9450974414ac1d8/pr-7577

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.

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

❌ Failed to cleanly apply 9c932f7 on top of patchback/backports/3.9/9c932f71ec5a450954cee92ff9450974414ac1d8/pr-7577

Backporting merged PR #7577 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/9c932f71ec5a450954cee92ff9450974414ac1d8/pr-7577 upstream/3.9

4. Now, cherry-pick PR CookieJar - return 'best-match' and not LIFO #7577 contents into that branch:

   $ git cherry-pick -x 9c932f71ec5a450954cee92ff9450974414ac1d8

   If it'll yell at you with something like fatal: Commit 9c932f71ec5a450954cee92ff9450974414ac1d8 is a merge but no -m option was given., add -m 1 as follows instead:

   $ git cherry-pick -m1 -x 9c932f71ec5a450954cee92ff9450974414ac1d8

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR CookieJar - return 'best-match' and not LIFO #7577 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/3.9/9c932f71ec5a450954cee92ff9450974414ac1d8/pr-7577

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.

Thanks a lot. I've sorted out the backports, so it'll be in the next release.