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.

Sign up for GitHub

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

Jump to bottom

files: relax requirement of merge() inputs #4106

Merged
merged 2 commits into from
Jul 18, 2024
Merged

files: relax requirement of merge() inputs #4106

merged 2 commits into from
Jul 18, 2024

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Jul 17, 2024

cc @ilyagr

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

yuja added 2 commits July 17, 2024 21:04
@yuja
files: extract pre-processing part from merge()
a76b025 
I'll make the first half generic over T: AsRef<[u8]>.
@yuja
files: relax requirement of merge() inputs
b8b2d5d 
Most callers have Merge<ContentHunk> or Merge<Vec<u8>>.
ilyagr
ilyagr approved these changes Jul 17, 2024
View reviewed changes
Copy link
Contributor

@ilyagr ilyagr left a comment

Choose a reason for hiding this comment

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

I see, you're trying to save me from all the ContentHunk madness. Thank you!

@ilyagr ilyagr mentioned this pull request Jul 17, 2024
Draft
3 tasks
@yuja yuja merged commit 1a38748 into jj-vcs:main Jul 18, 2024
17 checks passed
@yuja yuja deleted the push-wluslkqqqzlr branch July 18, 2024 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilyagr ilyagr ilyagr approved these changes

@bnjmnt4n bnjmnt4n bnjmnt4n approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yuja @bnjmnt4n @ilyagr