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

core: stdcm: fix Offset<Path> conversion when route has previous blocks #10380

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Jan 14, 2025

Fix #10339 (but only parts of it)

When the first route has several blocks and we don't start on the first one, the Offset<Path> would be off by the previous blocks length. Resulting is mismatched conflicts.

@eckter eckter requested a review from Erashin January 14, 2025 15:49
@eckter eckter requested a review from a team as a code owner January 14, 2025 15:49
@github-actions github-actions bot added the area:core Work on Core Service label Jan 14, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 14, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.64%. Comparing base (1004424) to head (a2efb67).
Report is 8 commits behind head on dev.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev   #10380      +/-   ##
==========================================
- Coverage   81.65%   81.64%   -0.01%     
==========================================
  Files        1066     1066              
  Lines      105687   105692       +5     
  Branches      727      727              
==========================================
+ Hits        86294    86296       +2     
- Misses      19352    19355       +3     
  Partials       41       41              
Flag Coverage Δ
editoast 73.68% <ø> (-0.01%) ⬇️
front 89.33% <ø> (ø)
gateway 2.18% <ø> (ø)
osrdyne 3.28% <ø> (ø)
railjson_generator 87.50% <ø> (ø)
tests 87.05% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@eckter eckter added this pull request to the merge queue Jan 15, 2025
Merged via the queue into dev with commit 28c157d Jan 15, 2025
27 checks passed
@eckter eckter deleted the ech/fix-stdcm-path-offset branch January 15, 2025 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:core Work on Core Service
Projects
None yet
Development

Successfully merging this pull request may close these issues.

core: stdcm: conflicts in post-processing
3 participants