cleanup: remove imediff2 legacy; add imediff invocation tests - #58
Merged
Conversation
Drop obsolete imediff2 detection and documentation. Modern dev-util/imediff supports both 2-way and 3-way merges; existing -a -o launch_tool invocations are unchanged. Add Tier D mock imediff tests for stage 3 (3-way) and stage 4 (2-way) to lock in command-line arguments and merge outcomes. Fixes #57
rich0
force-pushed
the
cleanup/imediff-legacy
branch
from
June 20, 2026 14:14
22e60a5 to
be26cfd
Compare
Resolve conflicts with gtkdiff removal (PR #59): keep imediff-only support and no gtkdiff in tool_saves_mergefile_when_aborted or --help.
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.
Fixes #57
Summary
Verifies and locks in modern
imediffcommand invocations for stages 3 and 4. Upstream osamuaoki/imediff confirms the existinglaunch_tool()strings are correct (-a -owith live/ancestor/new file order). No invocation changes.Removes legacy
imediff2support and aligns docs todev-util/imediff3.4.x+.Changes
install_mock_imediff()and Tier D tests for stage 3 (3-way) and stage 4 (2-way)imediff2fromcheck_toolregexes,--help, andlaunch_tool2-way matchcfg-update.conf,DEPENDENCIES.md,ARCHITECTURE.md,INVENTORY.md, ebuildTesting
196 passed, 0 failed.