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: remove Merge::take() #2535

Merged
merged 5 commits into from
Nov 6, 2023
Merged

merge: remove Merge::take() #2535

merged 5 commits into from
Nov 6, 2023

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Nov 6, 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 6, 2023 19:42
Since the underlying Merge data type is no longer (Vec<T>, Vec<T>), it doesn't
make sense to build removes/adds Vecs and concatenate them.
I'm going to add a Merge method that removes negative/positive terms pair, and
swap_remove() is the easiest option. The order of the conflicted ref targets
doesn't matter.
Merge::take() is no longer a cheap function. We can add into_vec() if needed.
@yuja yuja merged commit 3fddc31 into jj-vcs:main Nov 6, 2023
14 checks passed
@yuja yuja deleted the push-pmmllvrsuqtt branch November 6, 2023 21:52
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