feature: Stage 4 merge tools use /tmp view of Portage marker (issue #68) - #71
Merged
Conversation
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.
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
Implements #68: Stage 4 interactive 2-way merges pass tools a disposable
$TMPDIRcopy of the Portage marker ($path_new), reusing the Stage 3 helpers from #65 / PR #67.update_stage4callslaunch_tool_with_merge_view_temps(marker view; ancestor is a no-op when missing)*.mergeremain real; replace/keep/merge/cancel still use real paths after tool exittool_intronotes the new-file pane is a temporary view for 2-way-relevant toolsdocs/ARCHITECTURE.mdStage 4 documentedAcceptance criteria
/tmp(or$TMPDIR) copy of$path_newtool_intronotes temporary new pane when applicableTest plan
perl -c cfg-update./test/run-tests.sh --full(252 passed, 0 failed)