Merged
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
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.
Currently submodule DLR uses the following three "names":
src/dlrThe last one is mainly used by Git internal commands, but is being defined in
.gitmodules. This is almost the same as the path, except for the letter case. This is no problem for Windows and macOS, but can be a problem on Linux. To avoid confusion, this PR normalizes the submodule name to simply "DLR". There is one module in IronPython3 after all, and there is no need to create a hierarchy.To avoid problems with update, I recommend, on a clear DLR worktree, on the branch main:
.git/modules/Src/DLRto directory.git/modules/DLR(if using in a linked worktree, replace.gitwith$(cut -d' ' -f 2 .git), Bash syntax, only if linked worktree uses a separate config. Pwsh syntax:((sls 'gitdir:' .git) -split '\s+')[1])git submodule deinit --allgit pull upstream maingit submodule initgit submodule updateThis PR also includes some path changes needed for the submodule to work in IronPython.