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.

Sign up for GitHub

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

Jump to bottom

Add ConflictingLocksError class #6852

Merged

pmconne merged 17 commits into master from nick/conflictinglockserror

Jun 24, 2024

Contributor

nick4598 commented Jun 17, 2024 •

edited

Loading

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.

nick4598 added 3 commits

June 17, 2024 13:46


          adding conflictinglockserror

fb28c64


          rush change

5be74aa


          extract-api

c1ac698

nick4598 requested review from a team as code owners

June 17, 2024 20:27

nick4598 requested review from karolis-zukauskas and austeja-bentley

June 17, 2024 20:27

nick4598 changed the title ~~Add ConflictingLocksError type~~ Add ConflictingLocksError class

pmconne reviewed

View reviewed changes

common/api/core-common.api.md Outdated Show resolved Hide resolved

pmconne reviewed

View reviewed changes

core/common/src/IModelError.ts Outdated Show resolved Hide resolved

pmconne reviewed

View reviewed changes

core/common/src/IModelError.ts Outdated Show resolved Hide resolved

pmconne reviewed

View reviewed changes

core/common/src/IModelError.ts Show resolved Hide resolved

pmconne reviewed

View reviewed changes

core/backend/src/BackendHubAccess.ts Outdated Show resolved Hide resolved

nick4598 and others added 5 commits

June 18, 2024 09:12


          remove locklevel

57d5b3b


          move lockstate to core-common and run extract-api

40093e6


          attempt to address the rest of the comments

b4c09d5


          extract-api

bfbb077


          Update core/backend/src/BackendHubAccess.ts

63ad3df

Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>

pmconne reviewed

View reviewed changes

core/backend/src/BackendHubAccess.ts Show resolved Hide resolved

pmconne reviewed

View reviewed changes

core/common/src/IModelError.ts Outdated Show resolved Hide resolved

nick4598 and others added 5 commits

June 18, 2024 12:59


          export { lockstate } from @itwin/core-common

bb8d3cb


          Merge branch 'nick/conflictinglockserror' of https://github.com/iTwin…

3d566fd

…/itwinjs-core into nick/conflictinglockserror


          Update core/common/src/IModelError.ts

06d5d50

Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>


          extract-api again

c0dad6a


          duplicate and deprecate approach

aec5908

Contributor

mergify bot commented Jun 20, 2024

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

nick4598 and others added 4 commits

June 20, 2024 15:09


          Merge branch 'master' into nick/conflictinglockserror

e084478


          fix merge

01da43b


          Merge branch 'master' into nick/conflictinglockserror

fd23edc


          Merge branch 'master' into nick/conflictinglockserror

ba69371

pmconne approved these changes

View reviewed changes

pmconne merged commit 20cd3cd into master

16 checks passed

pmconne deleted the nick/conflictinglockserror branch

June 24, 2024 10:28

Contributor Author

nick4598 commented Jun 26, 2024

@Mergifyio backport release/4.7.x

Contributor

mergify bot commented Jun 26, 2024 •

edited

Loading

backport release/4.7.x

✅ Backports have been created

#6898 Add ConflictingLocksError class (backport #6852) [release/4.7.x] has been created for branch release/4.7.x but encountered conflicts

mergify bot pushed a commit that referenced this pull request


          Add ConflictingLocksError class (#6852)

b1668cf

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 bot mentioned this pull request

Add ConflictingLocksError class (backport #6852) [release/4.7.x] #6898

Closed

hl662 pushed a commit that referenced this pull request


          Add ConflictingLocksError class (#6852)

8f72937

Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet