Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Git Changesets #4952

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Git Changesets #4952

wants to merge 1 commit into from

Conversation

Caleb-T-Owens
Copy link
Contributor

@Caleb-T-Owens Caleb-T-Owens commented Sep 22, 2024

In this PR I'm outlining functionality of git changesets. This is by no means in its final state. I just wanted to start pushing my changes onto GitHub so I don't accidentally use a vim binding to replace every character with 0s again 😆 .

Copy link

vercel bot commented Sep 22, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 22, 2024 11:19pm

@github-actions github-actions bot added the rust Pull requests that update Rust code label Sep 22, 2024
@Caleb-T-Owens Caleb-T-Owens changed the title Start talking about changesets Git Changesets Sep 22, 2024
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We probably need to have a standard way of clearly marking a directory under a different license. I'm unsure exactly what legal waffle may or may not be required to correctly state the scope of a particular license.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CC @krlvi

Copy link
Contributor

@H1ghBre4k3r H1ghBre4k3r Sep 22, 2024

Choose a reason for hiding this comment

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

After some quick research, I found that it's apparently best practise to have a root license (which applies to the whole project) and extra licenses in sub folders of this project (if they should be licensed differently):

So, if we go with adding an information about that in the main license file and add the respective "new" licenses in sub folders (if needed), we should be one the safe side, I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @H1ghBre4k3r, I'll take a read through tomorrow and share with the team so we all have a shared understanding.

- Changesets should be able to be worked on by two different users remotely, with ways of merging together two diverged versions of a particular changeset.
- Changesets should have a unique identifier that tools can use to refer to them by.
- Refer to an arbitrary commit by a changeset, without rewriting it.
- Changesets need to be easily GCed.
Copy link
Member

Choose a reason for hiding this comment

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

What does this mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need to have some way of clearing up old and unnecessary change sets so we don't end up flooding the ODB

@Caleb-T-Owens
Copy link
Contributor Author

We've had an in person talk and we've decided to change it quite a bit

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
changesets rust Pull requests that update Rust code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants