Skip to content

HHH-1661 throw when merge() applied to a definitely-removed instance #5481

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
Merged
merged 2 commits into from
May 21, 2024
Merged

HHH-1661 throw when merge() applied to a definitely-removed instance #5481

merged 2 commits into from
May 21, 2024

Conversation

@jrenaat
Copy link
Member

@jrenaat jrenaat commented Oct 31, 2022 •
edited by hibernate-github-bot bot
Loading

@jrenaat jrenaat requested a review from beikov October 31, 2022 21:36
@jrenaat jrenaat force-pushed the HHH-1661-mergeinsert branch 2 times, most recently from 389d873 to 6e4e961 Compare October 31, 2022 21:42
beikov
beikov reviewed Nov 2, 2022
View reviewed changes
@jrenaat jrenaat force-pushed the HHH-1661-mergeinsert branch from 6e4e961 to eeca644 Compare November 2, 2022 12:53
@Sanne
Copy link
Member

Sanne commented Nov 2, 2022

Some conflicts materialized - sorry :) @jrenaat could you rebase it?

@beikov
Copy link
Member

beikov commented Nov 2, 2022

I have to adapt the PR a bit after the discussion today with Steve. Do not merge yet please, I'll take care of the rest.

@gavinking gavinking mentioned this pull request May 21, 2024
Closed
gavinking
gavinking requested changes May 21, 2024
View reviewed changes
Copy link
Member

@gavinking gavinking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is on the right track, but as per my comment, I don't think it's quite perfect.

Also please see what I wrote here: https://hibernate.atlassian.net/browse/HHH-1661?focusedCommentId=115352

@gavinking gavinking force-pushed the HHH-1661-mergeinsert branch from eeca644 to 991a259 Compare May 21, 2024 15:23
@hibernate-github-bot
Copy link

hibernate-github-bot bot commented May 21, 2024 •
edited
Loading

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
    ↳ Offending commits: [a5bc7ed]

› This message was automatically generated.

@gavinking gavinking self-assigned this May 21, 2024
@gavinking
Copy link
Member

gavinking commented May 21, 2024

This is now ready to go.

However, this is a breaking change, and I wonder if we should be targeting H7?

@beikov beikov force-pushed the HHH-1661-mergeinsert branch from 991a259 to d1c49bb Compare May 21, 2024 16:01
@gavinking
use static import
a5bc7ed 
Signed-off-by: Gavin King <gavin@hibernate.org>
@gavinking gavinking force-pushed the HHH-1661-mergeinsert branch from 7528d62 to 773c092 Compare May 21, 2024 18:29
@jrenaat @gavinking
HHH-1661 throw when merge() applied to a definitely-removed instance
ab0bc7b 
group effort by @jrenaat, @beikov, and myself

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
Signed-off-by: Gavin King <gavin@hibernate.org>
@gavinking gavinking force-pushed the HHH-1661-mergeinsert branch from 773c092 to ab0bc7b Compare May 21, 2024 18:34
@gavinking gavinking changed the title HHH-1661 Test case and (partial) fix HHH-1661 throw when merge() applied to a definitely-removed instance May 21, 2024
@gavinking
Copy link
Member

gavinking commented May 21, 2024

This is good with the latest changes from @beikov. I've squashed everything down to one commit.

@gavinking gavinking merged commit 522269e into hibernate:main May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@beikov beikov beikov approved these changes

@gavinking gavinking gavinking approved these changes

Assignees

@gavinking gavinking

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jrenaat @Sanne @beikov @gavinking