PR 5410 got merged but is not in fact merged

[hroncok]

Hello, I was just looking at #5410, which says it was merged in f1a9460 but that is not part of main any more.

Was there a rebase of the main branch that happened and erased this change? Should we send it again?

[nateprewitt]

This looks like an issue of merging into the wrong branch. #5410 was opened against master not main (likely opened before the cutover). I don't have a strong opinion on preserving it. We can look at removing it for the next release.

[hroncok]

That sounds dangerous. How many other (more important) chnages landed in master but were not included in main?

[sarkar-sourobrata]

Did this eventually get merged to main, or is there a PR open?

[nateprewitt]

That sounds dangerous. How many other (more important) chnages landed in master but were not included in main?

Dangerous seems a bit alarmist. Both branches existed at the same time for a couple weeks. PRs opened before that window may have merged into the incorrect branch, but this was ~5 years ago. This is the first instance of anyone pointing out an issue and I don't see other branches with the same behavior. If it was a truly a needed change, I'm certain someone would have re-raised it in the proceeding 5 year window.

[hroncok]

ack, thanks for the explanation.

I have https://github.com/psf/requests/compare/main...hroncok:requests:pr5410?expand=1, but I cannot open it because PRs are restricted.