Skip to content

Fix upload not supporting package metadata 2.3 - #690

Merged
dralley merged 1 commit into
pulp:mainfrom
gerrod3:pkginfo-2.3
Jun 28, 2024
Merged

Fix upload not supporting package metadata 2.3#690
dralley merged 1 commit into
pulp:mainfrom
gerrod3:pkginfo-2.3

Fix upload not supporting package metadata 2.3

433ab0a
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.11 completed Aug 12, 2024 in 2s

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

❌ Failed to cleanly apply 781b976 on top of patchback/backports/3.11/781b9767dae34e8619e3831ff8ad07de1a6222ec/pr-690

Details

Backporting merged PR #690 into main

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