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

fork with binary files #86

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fork with binary files #86

wants to merge 6 commits into from

Conversation

pelikhan
Copy link
Contributor

@pelikhan pelikhan commented Mar 10, 2022

This fix uses the fork head commit instead of the upstream commit when creating the PR tree. A number of tests fail as a result but I'm unsure whether that's expected or something broke.

Tested here:
microsoft/jacdac#932

  • flip assertions in fork tests (expected <-> actual value)
  • use fork head instead of parent head when creating trees of changes
  • adding missing create-fork-blob test variant
  • patching tests (they probably need proper recording)

@gr2m
Copy link
Owner

gr2m commented Mar 12, 2022

If you confirmed it working as expected, I'd say update the tests and let's merge it?

@pelikhan
Copy link
Contributor Author

pelikhan commented Mar 12, 2022 via email

@gr2m
Copy link
Owner

gr2m commented Mar 12, 2022

Hmm at first sight the error with test/use-fork.test.ts seems legit. If I read it right, it tries to load commits from gr2m instead of hipstersmoothie. I don't have time right now to investigate further myself. But if you do and share your findings and come to a conclusion how to fix the fork workflow for binary files without breaking existing workflows, I'm all for it

The CONTRIBUTING.md file has instructions how to update the test fixtures in case that's helpful

@pelikhan
Copy link
Contributor Author

pelikhan commented Jun 1, 2022

It may just be that the test output is confusing... It seems that we have the arguments backwards in the "expect" call!

image

In such case, the failure makes sense. We are trying to work on the fork side of things instead of the parent repo. IMO, the test need updating... but I'm not a git wizard nor plan to become one. Would be good to get more eyes on this.

@gr2m
Copy link
Owner

gr2m commented May 16, 2023

Could you help resolving the conflicts? I'd be happy to review and merge then

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.

None yet

2 participants