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
2 Commits
Author SHA1 Message Date
jschoubben 7ae223d4ff gitea: merge-pull merges plainly only from a watched-branches view read since the last change
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)
2026-11-22 14:14:09 +01:00
jschoubben 319f535002 gitea: merge-pull merges a repository with no watched branch plainly
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)
2026-11-22 14:01:03 +01:00