Repository navigation
[architect] docs(upstream): make CONFLICT_HOTSPOTS.md match the diff it describes - #60
Merged
Merged
Conversation
The map is pillar 2 of the rebase strategy in UPSTREAM_SYNC.md and the document upstream-sync.yml points every conflict issue at, but nothing checks it against the branch. Comparing the fork series against its base (bfe633a, the upstream commit 10fe6b6 sits on) finds 17 upstream files modified under src/ against 11 listed. Adds the six missing ones: src/config/Config.zig + src/config.zig +222 -6 src/termio/shell_integration.zig +24 -6 src/apprt/gtk/class/tab.zig +102 src/apprt/gtk/ui/1.5/tab.blp +1 -1 src/apprt/gtk/class.zig +1 Two of them, Config.zig and config.zig, were covered by the closing assertion that we never modify anything in src/config/ — an assertion that told a resolver to treat three intentional features as an accidental edit. That line is replaced by a note saying it changed rather than deleted silently. Config.zig is rated HIGH for a reason the other entries do not share: the window-theme patch changes an upstream default from .auto to .system instead of adding a field, so a rebase can drop it without conflicting. The recipe says to re-check it every time. Also records that twelve upstream workflows and two upstream docs are patched and out of this map's scope, which is a question for #55 rather than something to answer here. Refs #55 Signed-off-by: hanthor-hive-agent[bot] <hive@users.noreply.github.com>
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.
Refactor
CONFLICT_HOTSPOTS.mdis pillar 2 of the rebase strategy inUPSTREAM_SYNC.mdand the fileupstream-sync.ymlpoints every conflict issue at. Nothing checks it against the branch, and ithad drifted. This makes the document match the diff it describes.
Method. The fork series starts at
10fe6b628("ptyxis-port: M1+M2 — vendor ptyxis-agent"), soits base is
bfe633a94.git diff --name-only bfe633a94..HEAD, filtered to paths that existed atthe base, gives the upstream files the fork modifies: 32 in all, 17 under
src/. The map listed 11.Adds the six missing entries:
src/config/Config.zig+src/config.zigsrc/termio/shell_integration.zigsrc/apprt/gtk/class/tab.zig+src/apprt/gtk/ui/1.5/tab.blpsrc/apprt/gtk/class.zigReplaces the false assertion.
src/config/Config.zigandsrc/config.zigwere covered by theclosing list's "Anything in
src/config/(we read it, never modify)" — while carrying three forkfeatures (
exit-actionin40068cc, thewindow-themedefault in39c0067, the RFC #22agent-*options in56e3bf3). The map's own instruction on a conflict there is to treat it as"an accidental edit" and investigate, which sends whoever is on rebase duty hunting for a bug that
is three intentional features. The
src/config/line is replaced with a note recording that itchanged, rather than deleted silently — a resolver who remembers the old rule needs to be told.
Why
Config.zigis rated HIGH. Unlike every other entry, one of its patches is amodification, not an addition:
@"window-theme"was upstream.autoand we ship.system. Arebase can drop that without producing a conflict — upstream keeps
.auto, our line is gone,nothing fails, and the app silently stops following the desktop light/dark preference. The recipe
says to grep for it after every rebase whether or not the file conflicted.
Scope note in the preamble. The fork also patches twelve upstream workflows under
.github/workflows/and two upstream docs (README.md,HACKING.md). They conflict on rebaselike anything else. Whether they belong in this map is a scoping decision for a maintainer, so
this records the fact and points at the issue rather than answering it.
Documentation only — no code, no build, no behaviour change.
Refs #55 — that issue asks for the CI check that would keep this file honest automatically. This
PR corrects today's drift; it does not prevent tomorrow's, and should not close the issue.
Filed by architect agent (ACMM L6 — full mode)
— hive: agent=architect backend=claude model=claude-opus-5 claude=2.1.226