Skip to content
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

Replace uses of content_hash! with #[derive(ContentHash)] #3041

Merged
merged 1 commit into from
Feb 20, 2024

Conversation

emesterhazy
Copy link
Contributor

This is a pure refactor with no behavior changes.

@emesterhazy
Copy link
Contributor Author

Not quite sure how to stack commits on GitHub... but the intention is to submit this change after the diffbase that implements the macro is submitted.

@emesterhazy emesterhazy force-pushed the push-ruzwxounnsut branch 2 times, most recently from 568ae2c to e87eb86 Compare February 14, 2024 04:32
@thoughtpolice
Copy link
Contributor

thoughtpolice commented Feb 14, 2024

Not quite sure how to stack commits on GitHub... but the intention is to submit this change after the diffbase that implements the macro is submitted.

The way you did it just now is fine, though I think normally all of us just sorta "suck it up" and review every change on GitHub commit-by-commit. So you could split this into two PRs, or just one with two commits, depending on how you feel, I suppose.

@thoughtpolice
Copy link
Contributor

Also, @sunshowers also has mentioned in Discord that she uses a version of https://github.com/getcord/spr with jj support that she added in, to do stacked diffs. Maybe it would be worth suggesting this to contributors for now. I'm not sure.

@emesterhazy emesterhazy changed the base branch from push-ruzwxounnsut to push-sovruzpmulyr February 15, 2024 15:56
@emesterhazy emesterhazy force-pushed the push-onymwnywputl branch 2 times, most recently from 3ccd1c9 to 0cb8cd1 Compare February 16, 2024 04:12
@emesterhazy emesterhazy force-pushed the push-sovruzpmulyr branch 2 times, most recently from 131a18c to b9331eb Compare February 16, 2024 16:33
@martinvonz
Copy link
Member

Not quite sure how to stack commits on GitHub... but the intention is to submit this change after the diffbase that implements the macro is submitted.

As Austin said, this way is fine. It allows one PR to get in before another. Putting closely related commits in a single PR makes it easier to review, though, because GitHub makes it easy to navigate the stack.

Base automatically changed from push-sovruzpmulyr to main February 20, 2024 17:59
This is a pure refactor with no behavior changes.

#3054
@emesterhazy emesterhazy merged commit e8f324f into main Feb 20, 2024
15 checks passed
@emesterhazy emesterhazy deleted the push-onymwnywputl branch February 20, 2024 19:18
@sunshowers
Copy link

Also, @sunshowers also has mentioned in Discord that she uses a version of getcord/spr with jj support that she added in, to do stacked diffs. Maybe it would be worth suggesting this to contributors for now. I'm not sure.

An issue with this, as far as I know, is that spr requires that you can push branches to the upstream repo. That's because of the interaction between GitHub and spr -- the way stacks must be modeled (branches targeting other branches) requires that the target branch be part of the upstream repo.

This is not an issue with spr specifically -- it is inherent to how poorly GitHub deals with stacks. :(

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.

5 participants