cherry_picker problem
For reasons I don't understand, https://github.com/python/cpython/pull/22229 failed to backport to 3.9. The message says:
Sorry @eamanu <https://github.com/eamanu>, I had trouble checking out the |3.9| backport branch. Please backport using cherry_picker <https://pypi.org/project/cherry-picker/> on command line.
I don't know if this problem with checking out the 3.9 backport branch is part of my problem or not. The backport to 3.8 succeeded.
So, I'm trying to run cherry_picker, as suggested. It's set up locally with the most recent version (1.3.2). My local repo has an origin and an upstream remote:
[~/local/python/cpython]$ git remote -v origin git@github.com:ericvsmith/cpython.git (fetch) origin git@github.com:ericvsmith/cpython.git (push) upstream git@github.com:python/cpython.git (fetch) upstream git@github.com:python/cpython.git (push)
When I run cherry_picker, it says "Failed to push to origin ☹". I don't know why that would be, or what the implications are (except the backport not succeeding). The full output of running cherry_picker is below. As near as I can tell, there are no conflicts.
Any ideas? If I can't figure it out, I'll just leave this minor documentation fix in master and 3.8, but not 3.9.
Eric
[~/local/python/cpython]$ cherry_picker 94bfdee25db31941b187591ae5ae9bf3ed431090 3.9 🐍 🍒 ⛏
Now backporting '94bfdee25db31941b187591ae5ae9bf3ed431090' into '3.9' Switched to a new branch 'backport-94bfdee-3.9' Branch 'backport-94bfdee-3.9' set up to track remote branch '3.9' from 'upstream'.
[backport-94bfdee-3.9 37b1f2eaae] bpo-41778: Change a punctuation on documentation. (GH-22229) Author: Emmanuel Arias <eamanu@yaerobi.com> Date: Sun Sep 13 18:05:44 2020 -0300 1 file changed, 2 insertions(+), 2 deletions(-)
Failed to push to origin ☹ Switched to branch 'master' Your branch is up to date with 'origin/master'.
Deleted branch backport-94bfdee-3.9 (was 97bcdc8e9c).
branch backport-94bfdee-3.9 has been deleted.
Although maybe it did succeed? https://github.com/python/cpython/pull/22232 was created.
Eric
On 9/13/2020 5:32 PM, Eric V. Smith wrote:
For reasons I don't understand, https://github.com/python/cpython/pull/22229 failed to backport to 3.9. The message says:
Sorry @eamanu <https://github.com/eamanu>, I had trouble checking out the |3.9| backport branch. Please backport using cherry_picker <https://pypi.org/project/cherry-picker/> on command line.
I don't know if this problem with checking out the 3.9 backport branch is part of my problem or not. The backport to 3.8 succeeded.
So, I'm trying to run cherry_picker, as suggested. It's set up locally with the most recent version (1.3.2). My local repo has an origin and an upstream remote:
[~/local/python/cpython]$ git remote -v origin git@github.com:ericvsmith/cpython.git (fetch) origin git@github.com:ericvsmith/cpython.git (push) upstream git@github.com:python/cpython.git (fetch) upstream git@github.com:python/cpython.git (push)
When I run cherry_picker, it says "Failed to push to origin ☹". I don't know why that would be, or what the implications are (except the backport not succeeding). The full output of running cherry_picker is below. As near as I can tell, there are no conflicts.
Any ideas? If I can't figure it out, I'll just leave this minor documentation fix in master and 3.8, but not 3.9.
Eric
[~/local/python/cpython]$ cherry_picker 94bfdee25db31941b187591ae5ae9bf3ed431090 3.9 🐍 🍒 ⛏
Now backporting '94bfdee25db31941b187591ae5ae9bf3ed431090' into '3.9' Switched to a new branch 'backport-94bfdee-3.9' Branch 'backport-94bfdee-3.9' set up to track remote branch '3.9' from 'upstream'.
[backport-94bfdee-3.9 37b1f2eaae] bpo-41778: Change a punctuation on documentation. (GH-22229) Author: Emmanuel Arias <eamanu@yaerobi.com> Date: Sun Sep 13 18:05:44 2020 -0300 1 file changed, 2 insertions(+), 2 deletions(-)
Failed to push to origin ☹ Switched to branch 'master' Your branch is up to date with 'origin/master'.
Deleted branch backport-94bfdee-3.9 (was 97bcdc8e9c).
branch backport-94bfdee-3.9 has been deleted.
python-committers mailing list -- python-committers@python.org To unsubscribe send an email to python-committers-leave@python.org https://mail.python.org/mailman3/lists/python-committers.python.org/ Message archived at https://mail.python.org/archives/list/python-committers@python.org/message/B... Code of Conduct: https://www.python.org/psf/codeofconduct/
On 9/13/2020 5:32 PM, Eric V. Smith wrote:
For reasons I don't understand, https://github.com/python/cpython/pull/22229 failed to backport to 3.9. The message says:
Sorry @eamanu <https://github.com/eamanu>, I had trouble checking out the |3.9| backport branch. Please backport using cherry_picker <https://pypi.org/project/cherry-picker/> on command line.
This particular failure seems to be very low probability random. Perhaps a timing issue. I believe I usually re-add backport label (removing first if needed).
On 9/13/2020 7:42 PM, Terry Reedy wrote:
On 9/13/2020 5:32 PM, Eric V. Smith wrote:
For reasons I don't understand, https://github.com/python/cpython/pull/22229 failed to backport to 3.9. The message says:
Sorry @eamanu <https://github.com/eamanu>, I had trouble checking out the |3.9| backport branch. Please backport using cherry_picker <https://pypi.org/project/cherry-picker/> on command line.
This particular failure seems to be very low probability random. Perhaps a timing issue. I believe I usually re-add backport label (removing first if needed).
Thanks, Terry. That's a better plan than trying cherry_picker manually.
Eric
On 9/13/2020 7:58 PM, Eric V. Smith wrote:
On 9/13/2020 7:42 PM, Terry Reedy wrote:
On 9/13/2020 5:32 PM, Eric V. Smith wrote:
For reasons I don't understand, https://github.com/python/cpython/pull/22229 failed to backport to 3.9. The message says:
Sorry @eamanu <https://github.com/eamanu>, I had trouble checking out the |3.9| backport branch. Please backport using cherry_picker <https://pypi.org/project/cherry-picker/> on command line.
This particular failure seems to be very low probability random. Perhaps a timing issue. I believe I usually re-add backport label (removing first if needed).
Thanks, Terry. That's a better plan than trying cherry_picker manually.
There are other soft backport failures that can be retried. 'Merge conflict' is a definite failure needing manual resolution.
participants (2)
-
Eric V. Smith -
Terry Reedy