From 45a09f90e31c5948ddc673b70efffac942955704 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 22 Oct 2026 16:33:28 +0200 Subject: [PATCH] Carry a held merge's new announcement into its record (issue 1173) HoldMerge replaced the event on the flag only; the record kept the old one. --- internal/inventory/chain_rollouts.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/inventory/chain_rollouts.go b/internal/inventory/chain_rollouts.go index 4dfd89fe..ea69cdb7 100644 --- a/internal/inventory/chain_rollouts.go +++ b/internal/inventory/chain_rollouts.go @@ -634,6 +634,10 @@ func (e *recordEdit) apply(held []chain.HeldMerge) []chain.HeldMerge { } if f, has := e.flag[k]; has { h.Waiting, h.Alone = f.Waiting, f.Alone + // A merge put back to waiting may carry a new announcement (HoldMerge); every other flag copies its own. + if len(f.Event) > 0 { + h.Event = f.Event + } } out = append(out, h) }