Skip to content

Add pulpcore 3.115 compatibility - #455

Merged
mdellweg merged 1 commit into
pulp:mainfrom
jobselko:115-compat
Jul 23, 2026
Merged

mdellweg merged 1 commit into
pulp:mainfrom
jobselko:115-compat

Conversation

@jobselko

Copy link
Copy Markdown
Member

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

@jobselko jobselko self-assigned this Jul 23, 2026
@mdellweg
mdellweg enabled auto-merge (rebase) July 23, 2026 10:21

@mdellweg mdellweg left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that is all it takes... ;)

@mdellweg
mdellweg merged commit 4b8230c into pulp:main Jul 23, 2026
14 checks passed
@patchback

patchback Bot commented Jul 23, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 4b8230c on top of patchback/backports/0.7/4b8230c8b9bed793411fdb03798d99483e53c429/pr-455

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