Merge-pull merges a repository without a watched branch plainly (H-A-471) #736

Merged
mesh-tools merged 2 commits from fix/merge-unwatched into main 2026-11-22 13:22:56 +00:00
Member

Design lines

Design 47 H2, lead answer H-A-471 and its two addenda (hq branch design/47-H1-answers-59: 8fd62a24 "the note and merge-called", cb1b7176 "plain merges need a read view").

What changed

The gitea module (holder of the seat git), two commits:

  • 319f5350: a member whose repository has no watched branch (no entry, or an empty set, in the registrations' watched branches) is judged against nothing of the module graph, merged in the order named, answered and kept merged with the note "no delivery: the repository has no watched branch", and left out of merge-called by that kept note (at the call and at the start's re-say), so it starts no delivery. A group mixing it with watched members judges and delivers those as before; a watched repository whose base is unwatched stays refused. The holder answers at the seat git's form 3.
  • 7ae223d4: plain merges only from a watched-branches view read since the last change. The registrations holder keeps the time of its last read and of the last registration-changed heard; the merge call refuses every member ("the watched branches are not read yet") while the view is not read since that change, and a failed read is said and asked again with the module's growing wait.

Tests run

  • modules/gitea: npm test 187/187 pass (calls, guard, merge-call tests extended)
  • checks/*: pass

Reviewed-by: mesh-code-reviewer@shanks at 7ae223d4ff
Pushed-by: lead-47@shanks

Group: mesh-delivery #326 + mesh-catalog #736 (one merge call)

## Design lines Design 47 H2, lead answer H-A-471 and its two addenda (hq branch design/47-H1-answers-59: 8fd62a24 "the note and merge-called", cb1b7176 "plain merges need a read view"). ## What changed The gitea module (holder of the seat git), two commits: - 319f5350: a member whose repository has no watched branch (no entry, or an empty set, in the registrations' watched branches) is judged against nothing of the module graph, merged in the order named, answered and kept merged with the note "no delivery: the repository has no watched branch", and left out of merge-called by that kept note (at the call and at the start's re-say), so it starts no delivery. A group mixing it with watched members judges and delivers those as before; a watched repository whose base is unwatched stays refused. The holder answers at the seat git's form 3. - 7ae223d4: plain merges only from a watched-branches view read since the last change. The registrations holder keeps the time of its last read and of the last registration-changed heard; the merge call refuses every member ("the watched branches are not read yet") while the view is not read since that change, and a failed read is said and asked again with the module's growing wait. ## Tests run - modules/gitea: npm test 187/187 pass (calls, guard, merge-call tests extended) - checks/*: pass Reviewed-by: mesh-code-reviewer@shanks at 7ae223d4ff8ab2def86c8f5274fdd04591f5c39b Pushed-by: lead-47@shanks Group: mesh-delivery #326 + mesh-catalog #736 (one merge call)
mesh-tools added 2 commits 2026-11-22 13:22:30 +00:00
The operator wants the merge call to work for a repository of no module,
such as hq. A member whose repository has no watched branch (no entry, or
an empty set, in the registrations' watched branches) is judged against
nothing of the module graph (no failed required step at a fingerprint),
merged in the order named, answered and kept merged with the note "no
delivery: the repository has no watched branch", and left out of
merge-called by that kept note, at the call and at the start's re-say, so
it starts no delivery. A group mixing it with watched members judges and
delivers those as before. A watched repository whose base is unwatched
stays refused. The holder answers at the seat git's form 3.

Builds: design 47 H2 H-A-471 and its addendum (1), (2)
An unread or stale view held no entry for a watched repository, so every
member would have merged plainly with the note no delivery: a merge that
reports success and delivers nothing. The registrations holder now keeps
the time of its last read and of the last registration-changed heard; the
merge call refuses every member ("the watched branches are not read yet")
while the view is not read since that change, and a read that fails is
said and asked again with the module's growing wait until it answers.

Builds: design 47 H2 H-A-471 (second addendum); review finding H-A-471 addendum (2)
mesh-tools merged commit faaebee7df into main 2026-11-22 13:22:56 +00:00
mesh-tools deleted branch fix/merge-unwatched 2026-11-22 13:22:56 +00:00
Sign in to join this conversation.
No Reviewers
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-catalog#736