Skip to content

Inline scala-{library, backend} submodules #5869

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

Merged

Conversation

OlivierBlanvillain
Copy link
Contributor

This PR replaces the scala2-library submodule by copy pasting the relevant source files in tests, and does likewise for the scala-backend subodule by pulling the 16 files we use in compiler/src/scala/tools/nsc/backend/.

After this PR, the submodules will only be used for the community build, which simplifies the build, the setup instructions and hopefully everyone's live when checking out branches. The only downside is that this doesn't preserve the git history of these 16 backend files, one will have to follow the link in the commit message to get access to the full history.

@Blaisorblade
Copy link
Contributor

👍 on avoiding submodules most of the time!

FWIW, if you ever want git support for moving changes upstream, maybe git subtree is useful (I use it myself). It copy-pastes the files, so 99% of the users have to learn nothing about submodules or subtree, but also allows to pull or push changes to your local copy to the upstream repo (where you can browse the history). Pulling is fast, tho pushing is too slow IME.

@smarter smarter assigned OlivierBlanvillain and unassigned smarter Feb 7, 2019
@OlivierBlanvillain OlivierBlanvillain merged commit e4dd91f into scala:master Feb 8, 2019
@ghost ghost removed the stat:needs review label Feb 8, 2019
@Blaisorblade Blaisorblade deleted the inline-scala-submodules branch February 8, 2019 17:27
@liufengyun liufengyun mentioned this pull request Feb 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants