fix(organize): allow merging directories in overlay with metadata differences
Metadata
Current evaluation
Merged. Resolves #1487 by permitting overlay directories with differing permissions or ownership to merge without raising FileOrganizeError. Review feedback was incorporated via automated commits, CI passed, and the change was successfully merged.
Suggested action: —
No scores available.
Issue body
Multiple parts should be able to contribute to the same directory in the overlay partition, even if they have different permissions or ownership. Previously, such differences would trigger a FileOrganizeError during the organization phase.
Fixes: #1487
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged. Resolves #1487 by permitting overlay directories with differing permissions or ownership to merge without raising FileOrganizeError. Review feedback was incorporated via automated commits, CI passed, and the change was successfully merged. | |
| qwen3.6-35b-a3b-mtp-q6 |
Staleness:
20
Complexity:
45
Confidence:
80
|
needs review | Fixes FileOrganizeError when merging overlay directories with differing permissions or ownership. Recent commits applied review feedback to handle metadata conflicts deterministically. Currently under discussion with maintainer review pending. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1541 fix(organize): make organizing to the overlay idempotent | craft-parts | merged | Merged to fix overlay organization idempotency and resolve #1488. Copilot automatically resolved merge conflicts in commit 4282caa6, reverting BUILD_PARTITION while preserving OVERLAY_PARTITION logic. All tests pass. | |
| #1602 fix(organize): make organize to overlay behavior consistent | craft-parts | merged | Merged fix correcting glob-key organize behavior to overlay. Glob keys previously merged contents instead of nesting. Update restores expected nesting for consistency. Approved by three reviewers and passed CI checks. | |
| #1596 fix(organize): nest overlay directory globs | craft-parts | closed | Superseded by pull request #1602. The overlay directory glob nesting fix was replaced by a subsequent implementation. | |
| #1590 inconsistency in organize to overlay | craft-parts | closed | Inconsistent directory organization to overlay partitions was fixed in commit 139cbce6 via PR #1602. The change normalizes overlay handling in organize_files() to ensure consistent nesting for glob keys across all destinations. | |
| #1618 fix: handle dependencies when organizing to overlay | craft-parts | merged | Merged following approval and successful CI checks. Resolves dependency ordering during overlay organization by prioritizing BUILD steps over dependency STAGE steps, fixing issue #1611. Code was rebased on main prior to integration. | |
| #278 docs: add '(overlay)' to the `organize` key description | imagecraft | merged | Merged documentation update adding the overlay pseudo-partition mention to the organize key description. Approved by two reviewers and passed CI checks, clarifying a load-bearing rootfs copy feature. |