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 ConflictingLocksError class (backport #6852) [release/4.7.x] #6898

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 26, 2024

Taken from imodels-clients. So that they can surface this error properly to users and and those users can show some useful UI about who has their locks.


This is an automatic backport of pull request #6852 done by Mergify.

Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>
(cherry picked from commit 20cd3cd)

# Conflicts:
#	core/backend/src/test/standalone/IModelWrite.test.ts
@mergify mergify bot added the conflicts label Jun 26, 2024
@mergify mergify bot requested review from a team as code owners June 26, 2024 13:09
Copy link
Contributor Author

mergify bot commented Jun 26, 2024

Cherry-pick of 20cd3cd has failed:

On branch mergify/bp/release/4.7.x/pr-6852
Your branch is up to date with 'origin/release/4.7.x'.

You are currently cherry-picking commit 20cd3cdcca.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   common/api/core-backend.api.md
	modified:   common/api/core-common.api.md
	modified:   common/api/summary/core-backend.exports.csv
	modified:   common/api/summary/core-common.exports.csv
	new file:   common/changes/@itwin/core-backend/nick-conflictinglockserror_2024-06-17-17-47.json
	new file:   common/changes/@itwin/core-common/nick-conflictinglockserror_2024-06-17-17-47.json
	modified:   core/backend/src/BackendHubAccess.ts
	modified:   core/backend/src/IModelDb.ts
	modified:   core/backend/src/LocalHub.ts
	modified:   core/backend/src/ServerBasedLocks.ts
	modified:   core/backend/src/test/standalone/HubMock.test.ts
	modified:   core/backend/src/test/standalone/ServerBasedLocks.test.ts
	modified:   core/common/src/IModelError.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/backend/src/test/standalone/IModelWrite.test.ts

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team June 26, 2024 13:09
Copy link
Contributor Author

mergify bot commented Jul 1, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

@aruniverse aruniverse closed this Jul 1, 2024
@aruniverse
Copy link
Member

@nick4598 @austeja-bentley we can re-open this if we need to

@mergify mergify bot deleted the mergify/bp/release/4.7.x/pr-6852 branch July 1, 2024 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants