Skip to content
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

gh-78997: fix bad rebase of moved test file #100424

Merged
merged 1 commit into from Dec 22, 2022

Conversation

eli-schwartz
Copy link
Contributor

@eli-schwartz eli-schwartz commented Dec 22, 2022

During the process of merging in a year and a half of changes, the modified test file test_loading.py accidentally got converted to a newly added file in an old location, rather than an existing test file with an updated test.

Merge the changes in this file into the new canonical location since gh-93839, and delete the old file.

During the process of merging in a year and a half of changes, the
modified test file `test_loading.py` accidentally got converted to a
newly added file in an old location, rather than an existing test file
with an updated test.

Merge the changes in this file into the new canonical location since
pythongh-93839, and delete the old file.
@bedevere-bot bedevere-bot added awaiting review tests Tests in the Lib/test dir labels Dec 22, 2022
@bedevere-bot
Copy link

bedevere-bot commented Dec 22, 2022

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

FFY00
FFY00 approved these changes Dec 22, 2022
@FFY00 FFY00 changed the title gh-25177: fix bad rebase of moved test file gh-78997: fix bad rebase of moved test file Dec 22, 2022
@FFY00 FFY00 merged commit aa878f0 into python:main Dec 22, 2022
14 checks passed
@FFY00
Copy link
Member

FFY00 commented Dec 22, 2022

Thanks for catching this @eli-schwartz!

@eli-schwartz eli-schwartz deleted the fix-rebase-error branch Dec 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants