rfc: branch operations v2 - #677
Draft
aaltshuler wants to merge 2 commits into
Draft
Conversation
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 & why
Branch operations still reconstruct growing manifest history, and ancestry-eligible merges can replay source data into target-owned datasets. Propose RFC 0060 to replace current-state reconstruction with explicit immutable graph snapshots and conditional adoption commits, preserving the target's first-parent history.
The draft defines one current
__manifestauthority for logical refs, exact retained snapshot roots, independent writes after adoption, graph-wide immutable tags, historical reads/forks, merge preview, and safe logical deletion. Whole-state restore follows; rebase, cherry-pick, and selective revert require a later logical-change replay contract.This PR changes only the RFC and registry. It remains draft / not-started and does not accept a new format or activate runtime behavior.
Backing issue / RFC
Related work: accepted RFC 0057 / #638, branch-context and retained-ancestry work in #662, and bounded merge preparation in #668. The RFC records scoped relationships to existing authority, retention, recovery, feed, and GQ decisions. No existing decision is superseded by this draft.
Notes for reviewers
Checklist
Local verification
python3 scripts/check-docs.py— passed (132 Markdown files).bash scripts/check-agents-md.sh— passed.typos docs/rfcs/0060-branch-ops-v2.md docs/rfcs/README.md— passed.git diff --cached --check— passed.