Skip to content

[ntuple] Fix improper commit merge in RNTupleMerger.cxx #23736

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

Merged
silverweed merged 1 commit into from
Oct 16, 2026
Merged

[ntuple] Fix improper commit merge in RNTupleMerger.cxx #23736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tree/ntuple/src/RNTupleMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ ExtendDestinationModel(RDescriptorsComparison &descCmp, ROOT::RNTupleModel &dstM
field->SetColumnRepresentatives({representatives});
// Pinning the representative is not enough for truncated/quantized columns: their parameters
// are stored in the in-memory field, which CreateField() leaves at defaults.
auto restored = RestoreRealFieldParams(*field, *fieldDesc, *mergeData.fSrcDescriptor);
auto restored = RestoreRealFieldParams(*field, *fieldDesc, srcDesc);
if (!restored)
return R__FORWARD_ERROR(restored);
changeset.AddField(std::move(field));
Expand Down
Loading