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

Change 3614 into a bugfix #3763

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Change 3614 into a bugfix #3763

merged 1 commit into from
Oct 17, 2024

Conversation

dralley
Copy link
Contributor

@dralley dralley commented Oct 17, 2024

No description provided.

@dralley dralley merged commit da351cc into pulp:main Oct 17, 2024
10 checks passed
Copy link

patchback bot commented Oct 17, 2024

Backport to 3.25: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.25/da351cc7e450bdd9dc596ae7ede0cbb4b34bb17d/pr-3763

Backported as #3764

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 17, 2024

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

❌ Failed to cleanly apply da351cc on top of patchback/backports/3.27/da351cc7e450bdd9dc596ae7ede0cbb4b34bb17d/pr-3763

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

Backport to 3.26: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.26/da351cc7e450bdd9dc596ae7ede0cbb4b34bb17d/pr-3763

Backported as #3765

🤖 @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.

1 participant