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.

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

CDOCompareEditorUtil.handleMerges() modifies already cached CDORevision #16

Closed
estepper opened this issue Aug 31, 2023 · 0 comments
Closed

CDOCompareEditorUtil.handleMerges() modifies already cached CDORevision #16

estepper opened this issue Aug 31, 2023 · 0 comments
Assignees
@estepper
Labels
bug Something isn't working cdo-core CDO Model Repository (Core)
Milestone
4.24

Comments

@estepper
Copy link
Contributor

CDOCompareEditorUtil.handleMerges() does the following:

rightRevision.setBranchPoint(leftRevision);
rightRevision.setVersion(remoteVersion);

At this point rightRevision is already cached in the branch of leftRevision.
rightRevision should be copied and cached before it's being modified.
@estepper estepper added bug Something isn't working cdo-core CDO Model Repository (Core) labels Aug 31, 2023
@estepper estepper added this to the 4.24 milestone Aug 31, 2023
@estepper estepper self-assigned this Aug 31, 2023
estepper added a commit that referenced this issue Aug 31, 2023
@estepper
CDOCompareEditorUtil.handleMerges() modifies already cached CDORevision
8c3fd87 
#16
estepper added a commit that referenced this issue Aug 31, 2023
@estepper
CDOCompareEditorUtil.handleMerges() modifies already cached CDORevision
3fa6592 
#16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@estepper estepper

Labels
bug Something isn't working cdo-core CDO Model Repository (Core)
Projects
None yet
Milestone
4.24
Development

No branches or pull requests
1 participant
@estepper