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 connecting to npipe://, tcp://, and unix:// urls #8632

Merged
merged 35 commits into from
Aug 7, 2024

fix type

3bbf448
Select commit
Loading
Failed to load commit list.
Merged

Fix connecting to npipe://, tcp://, and unix:// urls #8632

fix type
3bbf448
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.10 completed Aug 7, 2024 in 4s

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

❌ Failed to cleanly apply b2691f2 on top of patchback/backports/3.10/b2691f211511dc476ce4fb77f2293e4082a8a357/pr-8632

Details

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