Conversation
…#236) Refines the develop-staleness guidance added in #233. Driving that promotion (#235) exposed that the `git log origin/develop..origin/main` form is noisy in this repo's bots-target-both model. ## Why Running `git log origin/develop..origin/main` on a clean, current `develop` returned ~50 commits - all routine promotion merges and `main`-direct dependabot/codegen commits whose content `develop` already carries via its own parallel bot PRs (even `--no-merges --cherry-pick --right-only` still lists them, since parallel bumps have different patch-ids). It cannot cheaply distinguish "develop is missing a main-only fix" from that expected topology noise. ## What changed Use a **content** diff that reflects final tree state, read directionally: - `git diff origin/main origin/develop` - hunks it would *remove* are content on `main` that `develop` lacks (real staleness); hunks it *adds* are `develop`'s normal unpromoted work. This also resolves the original Copilot objection to a plain `git diff` (that non-empty != stale): the fix is to read the diff's *direction*, not its emptiness. Verified on #235: for a clean `develop`, this diff was exactly the doc files `develop` adds - no `main`-only content - which is the correct "not stale" reading. Issue-closing keywords omitted (targets `develop`); no issue to close. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Promotes #236 to main by refining the develop staleness check guidance in AGENTS.md, switching from a commit-history based approach to a direction-aware git diff explanation to better match the repo’s “bots target both branches” model.
Changes:
- Update
AGENTS.mddevelop-staleness guidance to usegit diff origin/main origin/developand interpret results directionally. - Explain why the prior
git log origin/develop..origin/mainapproach is noisy in this repository’s topology.
Follow-up to #236, addressing a Copilot point raised on promotion PR #237: describing `-` lines as "real staleness" and `+` lines as "just" unpromoted work overstates what `git diff origin/main origin/develop` proves. ## Why A hunk where `develop` merely *modified* the same code shows both a `-` (main's old form) and a `+` (develop's new form) - that is normal unpromoted work, not staleness. Calling every `-` line "real staleness" is inaccurate. ## What changed Reframe `-` lines as **main-only differences to inspect** for staleness, and note that a `-`/`+` pair in one hunk is usually just `develop`'s own modification; a `-` line with **no** corresponding `develop`-side replacement is the stronger staleness signal. Targets `develop`; promotion PR #237 will carry it to `main`. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.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
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.
Promotes #236 to
main.What's promoted
AGENTS.mddevelop-staleness check fromgit log origin/develop..origin/mainto a direction-awaregit diff origin/main origin/develop(read by-/+line prefix). The commit-log form is noisy in this repo's bots-target-both model; a content diff reflects final tree state and cleanly separates main-only staleness (-lines) from develop's normal unpromoted work (+lines).Diff
developis a clean superset ofmain- the only difference is #236's own one-line edit toAGENTS.md. Nomain-only stragglers.