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

Allow core/<3.70. #3627

Conversation

ggainey
Copy link
Contributor

@ggainey ggainey commented Jun 21, 2024

fixes #3620.

(cherry picked from commit 1c36b39)

fixes pulp#3620.

(cherry picked from commit 1c36b39)
@ggainey ggainey marked this pull request as ready for review June 21, 2024 13:52
@ggainey ggainey requested a review from dralley June 21, 2024 13:52
@dralley dralley merged commit e3e96ea into pulp:3.26 Jun 21, 2024
12 of 14 checks passed
Copy link

patchback bot commented Jul 3, 2024

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

❌ Failed to cleanly apply e3e96ea on top of patchback/backports/3.26/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627

Backporting merged PR #3627 into 3.26

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

Copy link

patchback bot commented Jul 3, 2024

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

❌ Failed to cleanly apply e3e96ea on top of patchback/backports/3.25/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627

Backporting merged PR #3627 into 3.26

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

Successfully merging this pull request may close these issues.

2 participants