14 Jun
2022
14 Jun
'22
7:59 a.m.
On 2022-06-14 20:40:30 +0900 (+0900), Takashi Kajinami wrote: [...]
In the past, we abandoned backport without checking this and this resulted in broken commit id in some backports. (stable/train backports point to the commit id of ussuri backport, which was never merged). [...]
Not sure if it's too heavy-handed, but one workaround would be to add a Depends-On footer in the commit message of each backport referencing the change for the branch ahead of it. Then, Zuul would only ever allow the backport to merge if the same change on all newer branches had already merged successfully. -- Jeremy Stanley