WIP: Retain original key lookup and material ownership #48

Draft
erikinkinen wants to merge 3 commits from feature/ext-encrypted-file-growth into feature/ext-extent-allocation-boundaries
Owner

Retain original key lookup and material ownership.

Depends on #47 (feature/ext-extent-allocation-boundaries).

  • Separate this feature from the preceding changes.
  • Link matching provider PRs and complete integrated acceptance.

Cross-repository API dependencies are still being mapped to their feature PRs.

Retain original key lookup and material ownership. Depends on #47 (`feature/ext-extent-allocation-boundaries`). - [x] Separate this feature from the preceding changes. - [ ] Link matching provider PRs and complete integrated acceptance. Cross-repository API dependencies are still being mapped to their feature PRs.
erikinkinen added this to the Alpha 1 milestone 2026-10-30 12:21:50 +01:00
fix: Retain original key lookup and material ownership
Some checks failed
CI / test (pull_request) Has been skipped
CI / markdown (pull_request) Has been skipped
CI / markdown (push) Failing after 6s
CI / test (push) Failing after 1m12s
dbdbae16d0
Retain original key lookup and material ownership.
Grow encrypted files through original transactions.
ci: Use shared development dependency profiles
Some checks failed
CI / test (pull_request) Has been skipped
CI / markdown (pull_request) Has been skipped
CI / test (push) Has been cancelled
CI / markdown (push) Has been cancelled
cc898b0b64
Keep authored manifests on main and select coordinated providers through Integration. Resolve branches once per run, retain the frozen snapshot and helper identity as artifacts, and use shared source checks instead of copied tests and guides.
ci: Declare policy helper and output boundaries
Some checks failed
CI / test (pull_request) Has been skipped
CI / markdown (pull_request) Has been skipped
CI / markdown (push) Failing after 8s
CI / test (push) Failing after 2m39s
bc713c437c
Select a disjoint operation parent for policy evidence and explicitly identify the helper checkout excluded from original component input. Keep the complete dependency policy and existing acceptance commands.
Some checks failed
CI / test (pull_request) Has been skipped
CI / markdown (pull_request) Has been skipped
CI / markdown (push) Failing after 8s
CI / test (push) Failing after 2m39s
This pull request has changes conflicting with the target branch.
  • .github/workflows/ci.yml
  • ARCHITECTURE.md
  • Cargo.toml
  • README.md
  • ROADMAP.md
  • docs/file-size-accounting.md
  • src/media/fscrypt.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'feature/ext-encrypted-file-growth:feature/ext-encrypted-file-growth'
git switch 'feature/ext-encrypted-file-growth'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'feature/ext-extent-allocation-boundaries'
git merge --no-ff 'feature/ext-encrypted-file-growth'
git switch 'feature/ext-encrypted-file-growth'
git rebase 'feature/ext-extent-allocation-boundaries'
git switch 'feature/ext-extent-allocation-boundaries'
git merge --ff-only 'feature/ext-encrypted-file-growth'
git switch 'feature/ext-encrypted-file-growth'
git rebase 'feature/ext-extent-allocation-boundaries'
git switch 'feature/ext-extent-allocation-boundaries'
git merge --no-ff 'feature/ext-encrypted-file-growth'
git switch 'feature/ext-extent-allocation-boundaries'
git merge --squash 'feature/ext-encrypted-file-growth'
git switch 'feature/ext-extent-allocation-boundaries'
git merge --ff-only 'feature/ext-encrypted-file-growth'
git switch 'feature/ext-extent-allocation-boundaries'
git merge 'feature/ext-encrypted-file-growth'
git push origin 'feature/ext-extent-allocation-boundaries'
Sign in to join this conversation.
No description provided.