Skip to content

Remove empty directories from TFileMerger's output #19331

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

hageboeck
Copy link
Member

@hageboeck hageboeck commented Jul 10, 2025

  • Partial merging creates a full directory hierarchy in an output file,
    even if the user didn't ask for the directories to be merged.
  • Fix the doxygen of PartialMerge

Update:

#19330

@hageboeck hageboeck self-assigned this Jul 10, 2025
@hageboeck hageboeck requested a review from pcanal as a code owner July 10, 2025 10:36
Copy link

github-actions bot commented Jul 10, 2025

Test Results

    20 files      20 suites   3d 6h 14m 18s ⏱️
 3 198 tests  3 198 ✅ 0 💤 0 ❌
62 357 runs  62 357 ✅ 0 💤 0 ❌

Results for commit 5f1efc2.

♻️ This comment has been updated with latest results.

@dpiparo dpiparo requested a review from silverweed July 10, 2025 21:21
Copy link
Contributor

@silverweed silverweed left a comment

Choose a reason for hiding this comment

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

lgtm but maybe you want an approval also from @pcanal

@hageboeck hageboeck marked this pull request as draft July 12, 2025 10:29
@pcanal
Copy link
Member

pcanal commented Jul 15, 2025

maybe you want an approval also from @pcanal

The current state is draft, is it ready for review?

@hageboeck
Copy link
Member Author

The current state is draft, is it ready for review?

The things that I had pushed are ready for review, but I noticed that the partial merge tutorial is broken. I therefore went back to draft to prevent somebody merging by accident.

@hageboeck hageboeck added the skip ci Skip the full builds on the actions runners label Jul 16, 2025
@pcanal
Copy link
Member

pcanal commented Jul 16, 2025

Note: this PR is likely somewhat related to #18679

@hageboeck
Copy link
Member Author

hageboeck commented Jul 16, 2025

Note: this PR is likely somewhat related to #18679

Thanks! I will hold back this one, and re-test once the other one is merged!

Update:
I submitted the second test to be included in #18679, and rescoped this PR to only deal with the empty directories.

@hageboeck hageboeck removed the skip ci Skip the full builds on the actions runners label Jul 17, 2025
Doxygen was squashing this block into a paragraph, so it needed to be
split off and indented.
Also add docstring for AddObjectNames.
Partial merging creates a full directory hierarchy in an output file,
even if the user didn't ask for the directories to be merged.

Fix root-project#19330.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A partial merge in TFileMerger creates directories that users didn't ask for
3 participants