Skip to content

Update replication support to work with "atomic" replications#1174

Merged
dralley merged 1 commit intopulp:mainfrom
dralley:atomic
Mar 31, 2026
Merged

Update replication support to work with "atomic" replications#1174
dralley merged 1 commit intopulp:mainfrom
dralley:atomic

Conversation

@dralley
Copy link
Copy Markdown
Contributor

@dralley dralley commented Mar 31, 2026

📜 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

@dralley
Copy link
Copy Markdown
Contributor Author

dralley commented Mar 31, 2026

I added tags for every release in supported_release_branches, not sure if that list needs some cleanup though

Copy link
Copy Markdown
Contributor

@gerrod3 gerrod3 left a comment

Choose a reason for hiding this comment

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

Looks good for the backports.

@dralley dralley merged commit 8e14e14 into pulp:main Mar 31, 2026
14 checks passed
@patchback
Copy link
Copy Markdown

patchback bot commented Mar 31, 2026

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

❌ Failed to cleanly apply 8e14e14 on top of patchback/backports/3.11/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174

Backporting merged PR #1174 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.11/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174 upstream/3.11
  4. Now, cherry-pick PR Update replication support to work with "atomic" replications #1174 contents into that branch:
    $ git cherry-pick -x 8e14e14d7adba21df082470d1e536985ed96f77d
    If it'll yell at you with something like fatal: Commit 8e14e14d7adba21df082470d1e536985ed96f77d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 8e14e14d7adba21df082470d1e536985ed96f77d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update replication support to work with "atomic" replications #1174 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174
  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
Copy link
Copy Markdown

patchback bot commented Mar 31, 2026

Backport to 3.12: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.12/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174

Backported as #1175

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

@patchback
Copy link
Copy Markdown

patchback bot commented Mar 31, 2026

Backport to 3.13: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.13/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174

Backported as #1176

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

@patchback
Copy link
Copy Markdown

patchback bot commented Mar 31, 2026

Backport to 3.27: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.27/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174

Backported as #1177

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

@patchback
Copy link
Copy Markdown

patchback bot commented Mar 31, 2026

Backport to 3.28: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.28/8e14e14d7adba21df082470d1e536985ed96f77d/pr-1174

Backported as #1178

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