Skip to content

copilot-bluespec: Include in mainline copilot repo. Refs #623. #625

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

RyanGlScott
Copy link
Collaborator

@RyanGlScott RyanGlScott commented May 19, 2025

The copilot-bluespec package was originally developed in an external repo (https://github.com/Copilot-Language/copilot-bluespec), but there is interest in having all Copilot projects and libraries merged into the main https://github.com/Copilot-Language/copilot repo for ease of management.

This commit includes the last state of the old copilot-bluespec repo into the main Copilot repo as a new subdirectory, disregarding the commit history. It also adjusts the copilot-bluespec changelog to make the old issues refer to copilot-bluespec#<ISSUE_NUM> so that they are not interpreted as related to the main repo.

Fixes #623.

@RyanGlScott RyanGlScott force-pushed the develop-copilot-bluespec-upstream branch 4 times, most recently from 0811114 to 3728d59 Compare May 28, 2025 19:15
@ivanperez-keera
Copy link
Member

ivanperez-keera commented May 31, 2025

Change Manager: The README under copilot-bluespec and the cabal file are not the same. I can understand the difference in the Cabal file but not the one in the the README.

Can we have one commit that just adds copilot-bluespec exactly as it is in https://github.com/Copilot-Language/copilot-bluespec/ but in a sub-directory, with zero changes, and then in another commit make the change to the CHANGELOG adjusting the issue numbers, third commit adding the new entry to the CHANGELOG for #623, and nothing else?

I prefer to leave the change to the cabal file and the README for a separate issue. Let's try to keep this as simple as possible. There has to be a commit in the history of copilot such that, when that commit is checked out, diff <copilot-repo/copilot-bluespec> <copilot-bluespec-repo#currentmaster> only shows differences in .git/.github (no differences in any other file).

…uage#623.

The `copilot-bluespec` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-bluespec), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

This commit includes the last state of the old `copilot-bluespec` repo into the
main Copilot repo as a new subdirectory, disregarding the commit history. It
also adjusts the `copilot-bluespec` changelog to make the old issues refer to
`copilot-bluespec#<ISSUE_NUM>` so that they are not interpreted as related to
the main repo.
…guage#625.

The `copilot-bluespec` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-bluespec), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

Now that the `copilot-bluespec` package lives in the `copilot` repo, this
adjusts the issue numbers in the `copilot-bluespec` changelog to refer to the
old repo so that they will not be confused with issues in the `copilot` repo.
@RyanGlScott RyanGlScott force-pushed the develop-copilot-bluespec-upstream branch from 3728d59 to d3ea6cd Compare June 3, 2025 15:16
@RyanGlScott
Copy link
Collaborator Author

I have reverted the changes to the README and .cabal file for now. I have also split out the part that updates the issue numbers in the changelog into a separate commit.

@RyanGlScott
Copy link
Collaborator Author

Implementor: Fix implemented, review requested.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

copilot-bluespec: Include in mainline
2 participants