-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Post pylint 3.0.3 #9297
Post pylint 3.0.3 #9297
Conversation
4255774
to
ffff974
Compare
ffff974
to
39cfcc8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be a merge of the maintenance branch containing all the commit from maintenance/3.0.x ?
I rebased them out, was that wrong? I also had to manually delete the change log files. |
We need to actually merge due to |
Yeah, I did see that in the docs and did want to be conscious of this. What I didn't grok is that (and let me know if I have this right) is that there needs to be a commit before this one on main that sets the 3.0.x patch version). Sounds like this merge request we're discussing now would then have two commits. If I include all the older commits, which I did in 4255774, you see that the diff is exactly the same after the force-push to ffff974, other than needing to remove the deleted changelog fragments. The "compare" button shows this.
I didn't follow this part; the diff is actually a lot worse if you leave the older commits in. It's confused us before, although I can't find the PR where we discussed it. |
We should add an instruction to release.rst to go through and manually delete the changelog fragments. I just started attempting this from scratch and they still weren't picked up when merging maintenance into main. |
(I'll do it the classic way in another MR so we can unblock things.) |
It's voluntary to duplicate the fragment in 3.0.3 and 3.1.0 |
No description provided.