Skip to content

[5.7][ChangeLog] synchronize with main #42556

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 28, 2022
Merged

[5.7][ChangeLog] synchronize with main #42556

merged 1 commit into from
Apr 28, 2022

Conversation

glessard
Copy link
Contributor

@glessard glessard commented Apr 21, 2022 •
edited
Loading

  • adds SE-0333 and SE-0334 to the changelog
  • also synchronizes the rest of the log with the main branch, since they were somewhat out of sync.

@glessard glessard requested a review from a team as a code owner April 21, 2022 22:27
@glessard
Copy link
Contributor Author

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator

AnthonyLatsis commented Apr 22, 2022 •
edited
Loading

@glessard Hi! May I ask that you drop the changes from 144be6c or move them into their own commit with the same message as 5db44c3? We tend not to add links for PR-specific entries in the change log so I would like to at least have a link attached to a commit.

@glessard
Copy link
Contributor Author

@AnthonyLatsis do you mean adding that commit to this PR?

@glessard glessard changed the title [ChangeLog] synchronize with main [ChangeLog][5.7] synchronize with main Apr 22, 2022
@AnthonyLatsis
Copy link
Collaborator

The thing is that I already have a PR (#42361) that picks the changes from that commit over to the release branch, and I noticed the syncing in this PR does that as well — which I don't mind, but would really appreciate if those changes were applied under a separate commit with a matching message.

@AnthonyLatsis
Copy link
Collaborator

Thank you!

@glessard
Copy link
Contributor Author

@swift-ci please test

@glessard glessard changed the title [ChangeLog][5.7] synchronize with main [5.7][ChangeLog] synchronize with main Apr 22, 2022
@DougGregor
Copy link
Member

And... I merged a PR that causes conflicts here, sorry @glessard !

@glessard
Copy link
Contributor Author

@DougGregor The longer it waits, the more conflicted it gets 🤷🏽

@AnthonyLatsis
Copy link
Collaborator

I went ahead and merged my PR since you ran into a conflict. Thanks again, anyway!

@glessard
[ChangeLog] synchronize with main
a87aad5 
- adds omitted SE-0333 and SE-0334 changes
- sorts the SE links at the bottom
@glessard glessard force-pushed the changelog-updates branch from ca4f14c to a87aad5 Compare April 28, 2022 00:28
@glessard
Copy link
Contributor Author

@swift-ci please test

@glessard glessard merged commit c1fcf45 into swiftlang:release/5.7 Apr 28, 2022
@glessard glessard deleted the changelog-updates branch April 28, 2022 04:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephentyrone stephentyrone stephentyrone approved these changes

@airspeedswift airspeedswift Awaiting requested review from airspeedswift

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@glessard @AnthonyLatsis @DougGregor @stephentyrone