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 group related creation hooks if no user #674

Merged
merged 1 commit into from
Mar 31, 2022

Conversation

mdellweg
Copy link
Member

fixes #673

@ipanova ipanova changed the base branch from main to 2.10 March 31, 2022 10:17
@ipanova ipanova changed the base branch from 2.10 to 2.11 March 31, 2022 10:18
@ipanova ipanova changed the base branch from 2.11 to main March 31, 2022 10:18
@mdellweg mdellweg merged commit b1725ad into pulp:main Mar 31, 2022
@patchback
Copy link

patchback bot commented Mar 31, 2022

Backport to 2.10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.10/b1725ad6bb8803dc293cd9938cac5bde443f19e5/pr-674

Backported as #676

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

@patchback
Copy link

patchback bot commented Mar 31, 2022

Backport to 2.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.11/b1725ad6bb8803dc293cd9938cac5bde443f19e5/pr-674

Backported as #677

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

@patchback
Copy link

patchback bot commented Jun 13, 2023

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

❌ Failed to cleanly apply b1725ad on top of patchback/backports/2.9/b1725ad6bb8803dc293cd9938cac5bde443f19e5/pr-674

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

@pulp pulp deleted a comment from patchback bot Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error when creating container distribution during Katello repo sync
2 participants