Skip to content

Cannot create a backport #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
serhiy-storchaka opened this issue Mar 18, 2022 · 2 comments
Closed

Cannot create a backport #60

serhiy-storchaka opened this issue Mar 18, 2022 · 2 comments

Comments

@serhiy-storchaka
Copy link
Member

I get the following error when tried to backport python/cpython#31938.

$ cherry_picker dbbe4d2d0075fa0e95b069fb4780d79aae3514c7 3.9
🐍 πŸ’ ⛏
Now backporting 'dbbe4d2d0075fa0e95b069fb4780d79aae3514c7' into '3.9'
Error cherry-pick dbbe4d2d0075fa0e95b069fb4780d79aae3514c7.
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch backport-dbbe4d2-3.9
Your branch is up to date with 'upstream/3.9'.

You are currently cherry-picking commit dbbe4d2d00.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        1.diff
        bpo-42218.py
        test.c
        test.err
        test.out
        test.tests
        test2.c
        test_multiprocessing_fork.tests
        test_multiprocessing_fork2.tests

nothing added to commit but untracked files present (use "git add" to track)


Failed to cherry-pick dbbe4d2d0075fa0e95b069fb4780d79aae3514c7 into 3.9 ☹
... Stopping here.

To continue and resolve the conflict:
    $ cherry_picker --status  # to find out which files need attention
    # Fix the conflict
    $ cherry_picker --status  # should now say 'all conflict fixed'
    $ cherry_picker --continue

To abort the cherry-pick and cleanup:
    $ cherry_picker --abort

I have just upgraded cherry_picker from a very old version, so it may be related. I still did not try to use cherry_picker with other PRs.

@serhiy-storchaka
Copy link
Member Author

$ cherry_picker --status
🐍 πŸ’ ⛏
On branch backport-dbbe4d2-3.9
Your branch is up to date with 'upstream/3.9'.

You are currently cherry-picking commit dbbe4d2d00.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        1.diff
        bpo-42218.py
        test.c
        test.err
        test.out
        test.tests
        test2.c
        test_multiprocessing_fork.tests
        test_multiprocessing_fork2.tests

nothing added to commit but untracked files present (use "git add" to track)

git diff output is empty.

@serhiy-storchaka
Copy link
Member Author

Soryy, it was the changes already was backport to 3.9. Backporting to 3.10 failed several times, so I missed that backporting to 3.9 was successful.

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

No branches or pull requests

1 participant