Skip to content

[2026-07-25-rustjava-branch-hygiene] docs: record remote branch hygiene verdicts - #6

Merged
Jun025 merged 1 commit into
mainfrom
chore/branch-hygiene-2026-07-25
Jul 31, 2026
Merged

[2026-07-25-rustjava-branch-hygiene] docs: record remote branch hygiene verdicts#6
Jun025 merged 1 commit into
mainfrom
chore/branch-hygiene-2026-07-25

Conversation

@Jun025

@Jun025 Jun025 commented Jul 25, 2026

Copy link
Copy Markdown
Owner

Docs-only. Records the outcome of the 2026-07-25 remote branch hygiene sweep in STATE.md / REPORT.md.

Verdicts

branch verdict action
origin/dependabot/cargo/tracing-attributes-0.1.31 obsolete — the dependency itself is gone deleted from origin
origin/wie-ktf-hardening mixed — 8/12 commits already upstream, 4 residual preserved, per-commit table reported

dependabot branch

PR #4 (fa92ef9) replaced the sole #[tracing::instrument] with a manual span and dropped the
tracing-attributes direct dependency. Current main has no tracing-attributes entry in
java_runtime/Cargo.toml nor in Cargo.lock, so the branch patches a line that no longer exists.

wie-ktf-hardening

git cherry flagged all 12 commits as unapplied, but that was an artifact of origin/main
trailing upstream/main by 20 commits. Content-level grep against upstream/main shows 8 of the
12 landed there via squash merges (dlunch#174 dlunch#175 dlunch#176 dlunch#177 dlunch#180 dlunch#182) — including commit 8, whose
GC-rooting fix upstream solved differently via GlobalRef (dlunch#182). Four commits carry residual
value and are all real host-process panics.

Branch preserved for the orchestrator's follow-up decision. No force-push, no code changes.

🤖 Generated with Claude Code

Judged the two remaining remote branches on the fork:

- dependabot/cargo/tracing-attributes-0.1.31: deleted. PR #4 (fa92ef9)
  removed the tracing-attributes direct dependency outright, so the
  branch patches a Cargo.toml line that no longer exists.
- wie-ktf-hardening: preserved. 8 of its 12 commits are already in
  upstream/main via squash merges (dlunch#174 dlunch#175 dlunch#176 dlunch#177 dlunch#180 dlunch#182);
  git cherry missed this because origin/main trails upstream/main by
  20 commits. 4 commits carry residual value.

No code changes.

Co-Authored-By: Claude <noreply@anthropic.com>
@Jun025
Jun025 merged commit 2e61e93 into main Jul 31, 2026
7 of 8 checks passed
@Jun025
Jun025 deleted the chore/branch-hygiene-2026-07-25 branch July 31, 2026 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant