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 CSV2 Branch into lix-integration #3152

Merged
merged 62 commits into from
Sep 27, 2024
Merged

Merge CSV2 Branch into lix-integration #3152

merged 62 commits into from
Sep 27, 2024

Conversation

martin-lysk
Copy link
Contributor

@martin-lysk martin-lysk commented Sep 27, 2024

The branch contains various fixes needed in lix-integration:

lix/packages/sdk/src/merge/merge.ts:

  • merge function accepts merges of lix managing multiple files
  • merge function copies the files from source into target - if it finds changes in the source and the file does not exist in target (indicates the file is on change track in lix)

lix/packages/sdk/src/open/openLix.ts

  • close function ensures the change queue is settled and stoped - to avoid post lix close db access exceptions and prevent set timeout to leak memory

lix/packages/sdk/src/query-utilities/get-lowest-common-ancestor.ts

  • fixes a bug that lead to inifity loops: changes parent check in getLowestCommonAncestor to a falsy check. parent_id is returned as null and not as undefiend -

Copy link

changeset-bot bot commented Sep 27, 2024

⚠️ No Changeset found

Latest commit: d9009d7

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@martin-lysk
Copy link
Contributor Author

I merge this as preparation of the branching merge

@martin-lysk martin-lysk merged commit 5588efe into lix-integration Sep 27, 2024
2 checks passed
@martin-lysk martin-lysk deleted the csv-app2 branch September 27, 2024 09:20
@github-actions github-actions bot locked and limited conversation to collaborators Sep 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants