python / python/cherry-picker

multiple branches not honored after conflict resolution

Open
#50 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Dominant language
Python
Stars
65
Forks
47
Avg merge
5m
Merged PRs (30d)
1

Description

$ python -m cherry_picker e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5 3.10 3.9
Now backporting 'e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5' into '3.10'
Switched to a new branch 'backport-e6d1aa1-3.10'
Branch 'backport-e6d1aa1-3.10' set up to track remote branch '3.10' from 'upstream'.

Error cherry-pick e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5.
Auto-merging Lib/test/test_contextlib_async.py
CONFLICT (content): Merge conflict in Lib/test/test_contextlib_async.py
...

[resolve conflict]

$ python -m cherry_picker --continue
🐍 🍒 ⛏
remote:
remote: Create a pull request for 'backport-e6d1aa1-3.10' on GitHub by visiting:
remote:      https://github.com/belm0/cpython/pull/new/backport-e6d1aa1-3.10
remote:
To github.com:belm0/cpython.git
 * [new branch]            backport-e6d1aa1-3.10 -> backport-e6d1aa1-3.10

Backport PR URL:
https://github.com/python/cpython/compare/3.10...belm0:backport-e6d1aa1-3.10?expand=1
Switched to branch 'main'

Deleted branch backport-e6d1aa1-3.10 (was 91814316ed).

branch backport-e6d1aa1-3.10 has been deleted.

(cherry_picker exited with success, but backport to branch 3.9 was not processed)

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start at the python -m cherry_picker entry point and trace how --continue handles the branch arguments after a conflict in Lib/test/test_contextlib_async.py. Reproduce the command with both 3.10 and 3.9, then verify that resolving the conflict processes and reports a backport for each requested branch.

Written by the indexing model from the issue text.

Assessment

Tech stack
git, python
Domain
cli, tooling
Issue type
Bug
Difficulty
3/5
Estimated time
1-2 days
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
45/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.