Skip to content

Update replication support to work with "atomic" replications

248eb2d
Select commit
Loading
Failed to load commit list.
Merged

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

Update replication support to work with "atomic" replications
248eb2d
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.11 completed Mar 31, 2026 in 2s

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

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

Details

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 #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 #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!