Revert "[SE-0193] Rename the attributes to their final names" #1502
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test and merge |
|
Noted. |
|
So what is the purpose of the swift-4.2-branch of this repo? I assumed the issue was addressed with swiftlang/swift#15698 and swiftlang/swift#15699. |
|
Anyway this could be reverted once the next rebranch of swift-4.2-branch has done I think. |
|
@ikesyo apparently (and I did not know this when I reverted this PR) there is indeed a separate 4.2-branch for corelibs-foundation, but! there is a catch: there is an automerge set-up that unconditionally applies all the changes from master to the swift-4.2-branch. It should have been enough to simple remove this change in the 4.2 branch alone and not in master. And yes, you're right, once the rebranch happens, we can revert the revert. |
This was referenced Apr 17, 2018
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #1497 as it caused problems for Linux builds with swift-4.2-branch, where new attributes are not yet available.
corelibs-foundation code should be compatible with both swift-4.2-branch and master branches of the main Swift repo.