Repository navigation
fix: recognize consistent adopted stacks without resyncing history - #182
Merged
Merged
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.
A successful exact-history adoption used to make both
stack syncandstack absorbdemand that the operator repeat the adoption. A consistent adopted stack now reports a successful, observational sync with rebuild/push previews. Stale adoption still requires explicit base/tip review; unverifiable Git results and pending operations remain blocking. The observational path is separate from manifest writers and passes the existing global-lock writer guard.Absorb preserves the patch and names a non-adopted draft with the original manifest and path selection. Existing primary ownership and staged-path guards remain in force. Paths after
--are preserved by the absorb parser.Validation: 9 regression fixtures cover no-op state preservation, empty/stale adoption, failed ancestry reads, pending operations, and execution of the printed staged/unstaged remedies. The latest 28-check run includes all new fixtures, metadata compatibility, the manifest writer guard, module boundaries, and docs. Adoption edge compatibility also passes. Independent review READY on
1fac63155fe1dcca098275f43f357cb570443df5; version-bump and public-content checks pass. Version 0.47.24.