Release 1.11.0 - #73
Merged
Merged
Conversation
Release 1.10.4 merge
…ssue #65) Pass disposable copies of the 3-way ancestor and Portage ._cfg* marker to interactive merge tools so accidental saves on non-live panes cannot corrupt permanent backups or markers. Live file and *.merge output paths stay real. Also extends Tier D mocks/tests (hostile input overwrite, temp path checks) and clarifies tool_intro for 3-way tools.
Drop file-scope $path_view_* globals. make_merge_view_temps takes basename and real paths and returns the two view paths; cleanup takes those paths; launch_tool_with_merge_view_temps keeps them as my locals and only rebinds existing $path_backup_new/$path_new around launch_tool.
feature: Stage 3 merge tools use /tmp views of ancestor and marker (issue #65)
…stor promote (issue #66) Before promoting a staged marker snapshot to ._new-cfg_*, compare its MD5 to the Portage VDB CONTENTS digest for the live path (last-install BUILD_TIME). Mismatch skips ancestor promotion with a warning; missing VDB fails open. New helpers take all inputs via parameters/returns.
Capability-gated instructions so agents with MentisDB use chain cfg-update automatically; agents without it skip the section.
docs: optional MentisDB memory guidance in AGENTS.md
…omote feature: validate markers against Portage CONTENTS before ancestor promote (issue #66)
Reuse launch_tool_with_merge_view_temps so interactive 2-way tools receive a disposable $TMPDIR copy of $path_new, not the real ._cfg* marker. Live and *.merge paths stay real. Extend tool_intro, docs, and Tier D path/hostile coverage.
feature: Stage 4 merge tools use /tmp view of Portage marker (issue #68)
Absorb master ruleset smoke history; keep develop AGENTS.md content (MentisDB section and all prior develop guidance).
9 tasks
Made more accessible to the end user and described in terms of actual impact. Commit history still has the details of how it was done.
github-project-automation
Bot
moved this from Backlog
to Done
in Refactor/cleanup cfg-update
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
1 participant
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.
Summary
Minor safety/reliability release from
develop.User-facing
$TMPDIRcopies of ancestor and/or._cfg*markers so accidental saves cannot corrupt permanent backups or Portage markers (issues Safety improvement: Use temporary copies for non-live files in 3-way merge (e.g. Meld middle/right panes) #65, Safety: use temporary copy of Portage marker for Stage 4 manual 2-way merge tools #68)._new-cfg_*, compare the staged marker MD5 to Portage VDBCONTENTSfor the live path; mismatch skips promote with a warning; missing CONTENTS fails open (issue Validate ._cfg* markers against Portage CONTENTS hashes before promoting to backup ancestors #66)AGENTS.md(PR docs: optional MentisDB memory guidance in AGENTS.md #70)Branch hygiene
masterinto the release branch to absorb ruleset smoke commits; kept developAGENTS.mdcontent (history preserved, smoke content discarded)Maintainer
bump-version.sh 1.11.01.10.4→1.11.0ChangeLog
Checklist
./scripts/check-version.sh 1.11.0passes locallyperl -c cfg-updatepasses./test/run-tests.sh --fullpasses (252 passed)integrationcheck green on this PRPost-merge
Maintainer checklist: issue #72