[eclipse] Track repo's move to the "eclipse" GitHub org #3182
Assignees
Labels
eclipse
issues related to eclipse / eclipse foundation
Comments
marcdumais-work
changed the title
|
Here are the files that we found, that appear to have been copied from vscode. In some cases verbatim, in other cases smaller chunks. See CQ here
|
|
Files found copied from wjordan/browser-path CQ here
|
|
Files copied from Microsoft/vscode-debugadapter-node CQ here
|
|
Files copied from TypeFox/monaco-languageclient CQ here
|
|
Files copied from desktop/dugite CQ here
|
|
Files copied from textmate/tcl.tmbundle CQ here
|
|
@marcdumais-work for #3613, we need a CQ for https://github.com/Microsoft/vscode-java-debug |
|
I believe it can be closed thanks to the move :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
update 2018-11-16:
added in a comment below the files that I think we copied from vscode, in whole or in part. I think that in some cases we should add proper attribution so that we respect the MIT license, but ATM the focus is on confirming license compatibility with Theia. In some cases, "attribution" is probably in a "gray zone", e.g. keeping an original MIT license header is normally required, but if none was there in the first place, are we required to add it ourselves? CQ created for vscode.
update 2018-10-30:
Found ~60 more files that look like they were copied verbatim from vscode, by comparing checksums of all files, between the two repos (for now comparing just 1 commit on each repo). There might be more if we were to compare the overlapping history of each repo or if we had a more granular comparison than whole files. These files are mostly Textmate grammars (.tmLanguage.json) and icons (.svg). This checksum comparison has only been done against the vscode repo; we might find more if we compared to other related repos.
update 2018-10-26:
We recently noticed that some 3rd party content, mostly code and icons from the vs code project, were added to our code base without corresponding CQs being registered and "license certified". The Eclipse Foundation confirmed that the move of the repo needs to wait, until this is done.
update:
As part of the move of the project to the Eclipse Foundation, we will soon move this repo to the Eclipse GitHub organization:
eclipse/theia. This issue is to track what's left to do and plan the move.General considerations:
move, it will not be possible to have both the current and new repos concurrently active: some downtime is unavoidable. So let's plan the move a bit and get the buy-in from the people that will be involved.A project cannot make a release until the due diligence on the IP contained in that release is complete.latestrelease out there.Before Repo move
Update initial contribution commit
We need to update the Eclipse Foundation initial contribution commit, that was done on the master branch back in June, following feedback from the foundation. The resulting commit will be the first one of our new repo:
Re-add files with 3rd party content, misc updates
Then, right after the initial contribution commit, we need to insert some commits, that re-add the removed files (they are needed to compile, after all), one commit per approved CQ. Finally we want to add a NOTICE file and update CONTRIBUTING.md, according to the Foundation's guidelines.
Repo move - coordination
We need to identify a move date/time that fits involved persons. Announce in advance to the community, in some way. Tentatively:
The actual move steps, high-level:
initial contribution, following comments by the Eclipse Foundation, and insert a few extra commits after that one.eclipse_initialtag on the updated initial contribution commit.eclipse_initial. The original repo's history is not completely removed but rather hidden.Post-move:
Here are instructions how to update the initial contribution:
Update initial contribution:
See here where I pushed the result of a test-run of the steps below, on branch
eclipse-theiaof my fork. Please have a look and report any issue. This will be re-done on the move day.insert extra commits after original "initial contribution:
The extra commits to add are on branch
eclipse_foundation_submission: https://github.com/theia-ide/theia/commits/eclipse_foundation_submissionRebase interactive on the commit immediately before the initial contribution commit:
8a5132e5 [monaco-textmate] Add new Syntax ColoringMark commit "1e3f8dbb [eclipse] prepare the initial contribution" as
edit, leave the rest aspick.Add other commits from branch "eclipse_initial_submission":
The commit log should now look like:
The first time might fail, with a message about a commit being now empty. That's fine. Re-run the command to continue.
Squash together initial contribution and following commit
Then we need to squash-together commits "[eclipse] prepare the initial contribution" and "Removed files that have 3rd party content.", so that we have the initial contribution that we need: (note: the SHAs of all following commits will have changed, after the rebase above.
Rebase interactive on commit immediately followinf the initial contribution:
8a5132e5 [monaco-textmate] Add new Syntax Coloring:Squash the second commit:
6384480d Removed files that have 3rd party content.and keep all the rest:Once done with the rebase, we should have, in master, around the initial contribution:
Finally, force-push the result to the master branch of the repo.
Issues
Is there another way we could go this that would also preserve who committed each commit? AFAIK this might be un-avoidable, when using rebase like I do here.
According to the accepted SO answer here this only reflects that, for this new repo, I am the one who committed the latest version of these commits.
Links
The text was updated successfully, but these errors were encountered: