DD-2248: Name conflict between directory and file#242
Draft
jo-pol wants to merge 39 commits into
Draft
Conversation
jo-pol
commented
Apr 13, 2026
new files should be added as deep clones to the dataset
This partially reverts commit 76ddd1e.
same functionality
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR closes:
Special notes for your reviewer:
Suggestions on how to test this:
See new unit tests.
More complex manual tests than the DANS Jira issue describes:
Before deploy: create a dataset with conflicts like the screenshot above shows,
download all its files, unzip is not possible
the existing conflicts should be reported when executing as postgres user (see help):
web UI after deploy
bar/fooandfoo/bar/beerupload filesfooandbarwithout a path: the files are renamed with a-1extension.API
scripts/issues/dirs-duplicating-files/test-apis.pyto match your environment and a dataset without files. The actual results should match the expectations on the dashed lines.test tabular files, See also https://drivenbydata.atlassian.net/browse/DD-2270?focusedCommentId=68001
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
See the changed
dataset-management.rstfile, the other changed rst file had a typo.Is there a release notes update needed for this change?:
Existing datasets with the new type of duplicates should be detected and fixed.
Additional documentation: