Skip to content

Pin click to z-streams#1191

Merged
mdellweg merged 1 commit into
pulp:0.32from
mdellweg:patchback/backports/0.32/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189
May 12, 2025
Merged

Pin click to z-streams#1191
mdellweg merged 1 commit into
pulp:0.32from
mdellweg:patchback/backports/0.32/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189

Conversation

@mdellweg
Copy link
Copy Markdown
Member

It turns out the click library introduces breaking changes with y-releases.

(cherry picked from commit 6d643dd)

@mdellweg mdellweg marked this pull request as ready for review May 12, 2025 12:00
@mdellweg mdellweg enabled auto-merge (rebase) May 12, 2025 12:00
ggainey
ggainey previously approved these changes May 12, 2025
@mdellweg mdellweg force-pushed the patchback/backports/0.32/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189 branch 2 times, most recently from 2dfac6b to 4fb874b Compare May 12, 2025 12:15
It turns out the click library introduces breaking changes with
y-releases.

(cherry picked from commit 6d643dd)
@mdellweg mdellweg force-pushed the patchback/backports/0.32/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189 branch from 4fb874b to 302d181 Compare May 12, 2025 12:21
@mdellweg mdellweg merged commit 1eafe5c into pulp:0.32 May 12, 2025
19 checks passed
@mdellweg mdellweg deleted the patchback/backports/0.32/6d643dd541984d64e1e9557f4b3bed0c804ce91c/pr-1189 branch May 12, 2025 12:45
@patchback
Copy link
Copy Markdown

patchback Bot commented May 12, 2025

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

❌ Failed to cleanly apply 1eafe5c on top of patchback/backports/0.31/1eafe5c38450280fe0f13a8387b9ed69699583b4/pr-1191

Backporting merged PR #1191 into 0.32

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