Repository navigation
Switch to an aggregated Changes system with much lower collision rates [] - #342
Open
wchilders-nvidia wants to merge 1 commit into
Open
wchilders-nvidia wants to merge 1 commit into
wchilders-nvidia wants to merge 1 commit into
Conversation
Collaborator
|
AcknowlEDG review results updated for
CI success. |
nv-cmeerw
reviewed
Oct 22, 2026
| Steps: | ||
|
|
||
| 1. Draft the entry as UTF-8 prose in | ||
| `<dir>/pending_changes/<name>.chng.txt` (the `pending_changes/` beside |
Contributor
There was a problem hiding this comment.
Can we get rid of the .chng? It's already in a pending_changes directory.
This branch has not been deployed
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.
This PR changes procedures so that contributors stop editing
Changesfiles directly. Each change adds apending_changes/*.chng.txtentry instead, and a nightly job moves the entries into theChangesfile with the date added. This removes the merge conflicts at the top ofsrc/Changes(and makes it easier to work in forks which now just pull the updated Changes entry without conflict against their work).Suggested order
dev_tools/pylibs/edgchanges/is the entry format: the parser, its errors, tag wrapping and the date. Everything else builds on it.dev_tools/bin/edg-check-file-changesadds rules for.chng.txtfiles: aformat_errorskey, a spell check against the targetChangesfile plus//allowed_words:, trailing whitespace not counted toward the line limit, andget-commentsrequired only for code files.dev_tools/bin/edg-collect-changestakes aChangesfile and itspending_changes/directory.insert_entriesis the part to read closely: how it finds the newest version line, opens a new section when that version is already released, and replacesNo changes...git-hooks/pre-push.pyrejects an entry with any problem outright, with no "Okay?" prompt, so a push can't fail CI later. It also prints the//allowed_words:hint..github/workflows/:changes-fragments.ymlis the PR check andcollect-changes.ymlis the nightly job.paths-ignorewas added to three heavy workflows so the bot's changelog-only commits don't trigger them.AGENTS.md,CONTRIBUTING.md), thepending_changes/.gitignoreplaceholders, awin-binwrapper, typecheck registration, and the tests indev_tools/tests/.Decisions worth a second look
GH #Ntags.EDGcpfe/Nand an empty[]are rejected.Changesfile already uses pass the spell check. Other words need//allowed_words:.--version-from src/Changes.CHANGES_DIRSlist appears in both workflows and has to be kept the same by hand.timezone:key, which is new. If GitHub rejects it, the fallback is0 4,5 * * *in UTC, plus a step that only continues when it's 00:00 in Eastern time.What's verified and what isn't
--checkand collect runs worked on a scratch tree, including in the dev-env container.To try it locally: add an entry under
src/pending_changes/, then runedg-exec -- edg-collect-changes --check src/Changes src/pending_changes. Use--dry-runinstead of--checkto preview where the entry would go.