Skip to content

Fix sync failure with bandersnatch==5.3.0#555

Merged
gerrod3 merged 1 commit into
pulp:mainfrom
gerrod3:bander-5.3
Aug 2, 2022
Merged

Fix sync failure with bandersnatch==5.3.0#555
gerrod3 merged 1 commit into
pulp:mainfrom
gerrod3:bander-5.3

Conversation

@gerrod3

@gerrod3 gerrod3 commented Aug 2, 2022

Copy link
Copy Markdown
Contributor

fixes: #554

@gerrod3
gerrod3 merged commit dd3cc1d into pulp:main Aug 2, 2022
@gerrod3
gerrod3 deleted the bander-5.3 branch August 2, 2022 20:04
@patchback

patchback Bot commented Aug 2, 2022

Copy link
Copy Markdown

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

❌ Failed to cleanly apply dd3cc1d on top of patchback/backports/3.6/dd3cc1d2f593391a1803ff32293f7264b99bf913/pr-555

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

@patchback

patchback Bot commented Aug 2, 2022

Copy link
Copy Markdown

Backport to 3.7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.7/dd3cc1d2f593391a1803ff32293f7264b99bf913/pr-555

Backported as #556

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

patchback Bot pushed a commit that referenced this pull request Aug 2, 2022
Fix sync failure with bandersnatch==5.3.0

(cherry picked from commit dd3cc1d)
fao89 pushed a commit that referenced this pull request Aug 4, 2022
Fix sync failure with bandersnatch==5.3.0

(cherry picked from commit dd3cc1d)
gerrod3 added a commit to gerrod3/pulp_python that referenced this pull request Aug 19, 2022
Fix sync failure with bandersnatch==5.3.0

(cherry picked from commit dd3cc1d)
gerrod3 added a commit to gerrod3/pulp_python that referenced this pull request Aug 19, 2022
Fix sync failure with bandersnatch==5.3.0

(cherry picked from commit dd3cc1d)
[noissue]
dralley pushed a commit that referenced this pull request Aug 19, 2022
Fix sync failure with bandersnatch==5.3.0

(cherry picked from commit dd3cc1d)
[noissue]
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.

Syncs failing with new Bandersnatch 5.3.0

2 participants