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

Add changeset conflict handler to IModelDb (backport #6437) [release/4.4.x] #6546

Merged
merged 6 commits into from
Mar 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 21, 2024

  1. Add typescript changeset and apply conflict hander to make it easy to update it.
  2. This PR also fixes a reported issue where indirect change was causing data conflict.

imodel-native: iTwin/imodel-native#682


This is an automatic backport of pull request #6437 done by [Mergify](https://mergify.com).
The reason for this PR is that imodel-transformer test fails on 4.4.7 of itwinjs-core. ```

Error | DgnCore | UPDATE/DELETE before value do not match with one in db or CASCADE action was triggered.
Info | Changeset | Table: bis_Model
Info | Changeset | key=2199023255555,UPDATE(indirect),LastMod=2460391.06128832185640931->2460391.06128895841538906,ps1=...->...
Info | BeSQLite | bis_Model.LastMod was 2460391.06129459477961063
Info | BeSQLite | bis_Model.ps1 was ...
Error | DgnCore | failed to apply changeset: BE_SQLITE_ABORT

I confirmed that this same test passes on 4.5.0-dev.29, which includes this PR I am backporting.

Co-authored-by: Affan Khan <khanaffan@users.noreply.github.com>
(cherry picked from commit 918ffab)
@hl662
Copy link
Contributor

hl662 commented Mar 25, 2024

/azp run iTwin.js

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mergify mergify bot requested review from a team, aruniverse, calebmshafer and wgoehrig as code owners March 27, 2024 12:33
@nick4598 nick4598 enabled auto-merge (squash) March 27, 2024 13:49
@mergify mergify bot requested a review from ColinKerr as a code owner March 27, 2024 20:31
@nick4598 nick4598 merged commit 8236cb3 into release/4.4.x Mar 27, 2024
13 checks passed
@nick4598 nick4598 deleted the mergify/bp/release/4.4.x/pr-6437 branch March 27, 2024 21:01
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.

6 participants