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

merge: prep for changing internal representation of Merge values #2527

Merged
merged 5 commits into from
Nov 5, 2023

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Nov 5, 2023

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 5 commits November 5, 2023 14:20
The current adds()/removes() will be changed to return iterators.
We have a few callers which just need to obtain an object common among all
the merge values. Let's add a non-failing accessor for that purpose.
…n't matter

Merge::iter() will be a slice::Iter, and be more efficient than chaining adds
and removes.
The Merge type will be changed to store interleaved values internally.
@yuja yuja merged commit d9fbf21 into jj-vcs:main Nov 5, 2023
14 checks passed
@yuja yuja deleted the push-qqtmwkmskvlu branch November 5, 2023 07:43
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.

2 participants