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.

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

Move Quotes and IArray to src-bootstrapped #10998

Merged
merged 2 commits into from
Jan 5, 2021
Merged

Move Quotes and IArray to src-bootstrapped #10998

merged 2 commits into from
Jan 5, 2021

Conversation

nicolasstucki
Copy link
Contributor

This extracts a change done in #10950. Merging this one first will make it easier to track the actual changes in Quotes in done in #10950.

@nicolasstucki nicolasstucki marked this pull request as ready for review January 5, 2021 10:06
liufengyun
liufengyun approved these changes Jan 5, 2021
View reviewed changes
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nicolasstucki nicolasstucki changed the title Move quoted.Quotes to src-bootstrapped Move Quotes and IArray to src-bootstrapped Jan 5, 2021
@nicolasstucki
Copy link
Contributor Author

@liufengyun I also added IArray. This one is more important to avoid losing the history of IArray.scala

@nicolasstucki nicolasstucki force-pushed the move-Quotes-to-src-bootstrapped branch from bc7fcdc to 7c6c11f Compare January 5, 2021 11:42
@liufengyun
Copy link
Contributor

@liufengyun I also added IArray. This one is more important to avoid losing the history of IArray.scala

What's the motivation for the move? It seems to just duplicate the file.

@nicolasstucki
Copy link
Contributor Author

Yes, it just moves the file and creates a duplicate. This ensures the library/src/scala/IArray.scala is moved with it's history to library/src-bootstrapped/scala/IArray.scala. If we do the move when we do the changes to that file, git moves the file to src-non-bootstrapped and assumes that the one in src-bootstrapped is a new file (hence loss of history). Here I removed the comments from the src-non-bootstrapped version to make sure that git understands this is the new file.

liufengyun
liufengyun approved these changes Jan 5, 2021
View reviewed changes
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nicolasstucki nicolasstucki mentioned this pull request Jan 5, 2021
Closed
2 tasks
@nicolasstucki nicolasstucki merged commit 1405778 into scala:master Jan 5, 2021
@nicolasstucki nicolasstucki deleted the move-Quotes-to-src-bootstrapped branch January 5, 2021 13:08
This was referenced Jan 5, 2021
Merged
Merged
@Kordyjan Kordyjan added this to the 3.0.0 milestone Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liufengyun liufengyun liufengyun approved these changes

Assignees

@liufengyun liufengyun

Labels
None yet
Projects
None yet
Milestone
3.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nicolasstucki @liufengyun @Kordyjan