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

fix(index): Revise merged revisions to avoid duplication #1170

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

apeteri
Copy link
Member

@apeteri apeteri commented Jun 14, 2023

This PR adds two test cases and a proposed fix to the issue where two revisions on separate branches end up in the same state, but neither receives a revised entry when one of the branches is merged to the other. Subject to further discussions. 😄

Related ticket: https://snowowl.atlassian.net/browse/SO-5672

@apeteri apeteri added the bug label Jun 14, 2023
@apeteri apeteri self-assigned this Jun 14, 2023
@codecov
Copy link

codecov bot commented Jun 14, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (75ce17a) 64.09% compared to head (a5979c1) 64.08%.
Report is 6 commits behind head on 9.x.

Additional details and impacted files
@@             Coverage Diff              @@
##                9.x    #1170      +/-   ##
============================================
- Coverage     64.09%   64.08%   -0.01%     
  Complexity    13169    13169              
============================================
  Files          1796     1796              
  Lines         61540    61540              
  Branches       5717     5717              
============================================
- Hits          39441    39440       -1     
- Misses        19621    19623       +2     
+ Partials       2478     2477       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@apeteri apeteri added the port-to-7.x Pull requests that need a complementary PR targeting the 7.x stream label Jun 16, 2023
@apeteri apeteri marked this pull request as ready for review June 16, 2023 09:55
Copy link
Member

@cmark cmark left a comment

Choose a reason for hiding this comment

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

🥓 Looks okay, but let me check a few things before merging.

@cmark cmark added the on hold label Jun 16, 2023
@cmark cmark changed the base branch from 8.x to 9.x November 14, 2023 07:42
@cmark
Copy link
Member

cmark commented Nov 14, 2023

Migrating to 9.x

...and target for "net zero" changes; don't mention the object in the
corresponding commit document however.
@cmark cmark force-pushed the issue/SO-5820-duplicate-description-revision branch from 54719ba to a5979c1 Compare November 14, 2023 15:31
@cmark
Copy link
Member

cmark commented Nov 14, 2023

NOTE: test cases have been moved to https://github.com/b2ihealthcare/snow-owl-ext/pull/2739

@cmark cmark requested a review from nagyo November 14, 2023 15:33
Copy link
Member

@nagyo nagyo left a comment

Choose a reason for hiding this comment

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

RSLGTM!

@cmark cmark merged commit a7275ac into 9.x Nov 15, 2023
3 of 4 checks passed
@cmark cmark deleted the issue/SO-5820-duplicate-description-revision branch November 15, 2023 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug on hold port-to-7.x Pull requests that need a complementary PR targeting the 7.x stream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants