Skip to content

SO-6448: donated content reappears as added in revision compare results #1398

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 3 commits into from
Jul 22, 2025
Merged

SO-6448: donated content reappears as added in revision compare results #1398

merged 3 commits into from
Jul 22, 2025

Conversation

cmark
Copy link
Member

@cmark cmark commented Jul 18, 2025 •
edited
Loading

cmark added 2 commits July 18, 2025 15:53
@cmark
test(index): add test related to compare issue when checking branch...
43d7d07 
...changeset after successful merge with donated content
@cmark
fix(index): track donated* content properly in merge commit documents...
e65a1bb 
...to avoid them from reappearing in future compare results and causing
issues during upgrades or in other places

*donated: a revision document that added to another branch with the same
unique ID and resolved during merge when the added vs added conflict is
detected
@cmark cmark requested review from apeteri, nagyo and AAAlinaaa July 18, 2025 13:58
@cmark cmark self-assigned this Jul 18, 2025
@cmark cmark added the bug label Jul 18, 2025
@codecov Codecov
Copy link

codecov bot commented Jul 18, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 94.28571% with 2 lines in your changes missing coverage. Please review.

Project coverage is 64.42%. Comparing base (78e4e16) to head (5f73c91).
Report is 5 commits behind head on 9.x.

Files with missing lines Patch % Lines
...om/b2international/index/revision/StagingArea.java 94.28% 0 Missing and 2 partials ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                9.x    #1398      +/-   ##
============================================
- Coverage     64.42%   64.42%   -0.01%     
- Complexity    12723    12727       +4     
============================================
  Files          1614     1614              
  Lines         57392    57403      +11     
  Branches       5639     5643       +4     
============================================
+ Hits          36974    36980       +6     
- Misses        18061    18064       +3     
- Partials       2357     2359       +2

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@cmark cmark marked this pull request as ready for review July 21, 2025 13:50
apeteri
apeteri approved these changes Jul 22, 2025
View reviewed changes
Copy link
Member

@apeteri apeteri left a comment

Choose a reason for hiding this comment

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

LGTM

nagyo
nagyo approved these changes Jul 22, 2025
View reviewed changes
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.

semi-RSLGTM, semi-LGTM!

@cmark cmark merged commit 5b785f8 into 9.x Jul 22, 2025
5 checks passed
@cmark cmark deleted the issue/SO-6448-revision-compare-donated-content-reappears-as-added branch July 22, 2025 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apeteri apeteri apeteri approved these changes

@nagyo nagyo nagyo approved these changes

@AAAlinaaa AAAlinaaa Awaiting requested review from AAAlinaaa

Assignees

@cmark cmark

Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cmark @apeteri @nagyo