Claude
26ff8f2ac9
Resolves the four-file conflict with PR #444, which landed a parallel implementation of the same batch-fsync design (unsynced chunk writes plus one sync_blobs durability barrier). Both sides converged on identical trait signatures; main's version is kept for all overlapping code since it is already merged and carries unit tests: - blob_storage_ports.rs: doc-comment-only conflict, main's docs kept - dedup_service.rs: main's pipeline kept. The naive textual merge would have retained BOTH durability-barrier/INSERT blocks, double-counting ref_count for every new chunk; the duplicated block from this branch is dropped - encrypted_blob_backend.rs, local_blob_backend.rs: main's implementations kept (fsync_paths_parallel + tests); this branch's equivalent helpers (fsync_dir, fsync_blob_file, SYNC_BLOBS_CONCURRENCY) are referenced nowhere else and are dropped Everything unique to this branch (streaming PROPFIND, range requests, batch ID resolution, CalDAV/CardDAV indexed lookups, transcode and breadcrumb changes) merges cleanly and is unchanged. https://claude.ai/code/session_01GpprjxjtXFYLfXNkoKnHuL
41 lines
573 B
Plaintext
41 lines
573 B
Plaintext
# Build artifacts
|
|
target/
|
|
|
|
# Git
|
|
.git/
|
|
.gitignore
|
|
|
|
# IDE
|
|
.vscode/
|
|
.idea/
|
|
*.swp
|
|
*.swo
|
|
|
|
# Docker
|
|
Dockerfile
|
|
Dockerfile.rootless
|
|
docker-compose.yml
|
|
rootless-compose.yml
|
|
|
|
# Runtime data (mapped via volumes)
|
|
storage/
|
|
|
|
# Documentation
|
|
docs/
|
|
*.md
|
|
LICENSE
|
|
CODEOWNERS
|
|
|
|
# Project assets and tooling not needed by the build
|
|
# (the Dockerfile only COPYs src, static, migrations, templates, build.rs,
|
|
# Cargo.*, and entrypoint.sh; everything else is dead weight in the context)
|
|
images/
|
|
charts/
|
|
tools/
|
|
tests/
|
|
|
|
# Miscellaneous
|
|
.github/
|
|
.env
|
|
*.bak
|