[Development] Automatically abandoning cherry-picks for closed branches?

[Daniel Smith]

I think both of these should likely come via modifications of https://contribute.qt-project.org/quips/16.

At the moment, there is no process defined other than the creating of new branches. As for new processes, one of the challenges we have is the moving of changes between branches. While easy to automate for public -> public branch moves, the Qt Company maintains "qt/tqtc-" shadow repos, and changes which are on a public branch like 6.9 in qt/qtbase, for example, cannot simply be moved to the next target branch if that branch is a tqtc branch in the tqtc shadow repo. The only real solution for automation here is then uploading the change to the tqtc target branch (like tqtc/lts-6.8) and abandoning the one on the now-closed branch (like 6.9 at present).

However, this comes with the with the caveats that discussion and comments would be lost, along with the need to ensure that a TQtC developer is assigned in the case that the original author is outside the company and would no longer be able to bear responsibility for the change if moved to a tqtc branch.

This is all doable, but we would need to define that process publicly before taking action using automation as a process.

-Daniel

Confidential
________________________________
From: Development <development-bounces at qt-project.org> on behalf of Christian Ehrlicher via Development <development at qt-project.org>
Sent: Saturday, October 11, 2025 2:01 PM
To: development at qt-project.org <development at qt-project.org>
Subject: [Development] Automatically abandoning cherry-picks for closed branches?

Hi,

I wonder if we could have a bot which automatically closes cherry-picks
for branches which are closed. Currently there are 108 open cherry-picks
from which only ~20 are for an still open branch:
https://codereview.qt-project.org/q/owner:cherrypick_bot%2540qt-project.org+is:open+repo:qt/qtbase

And what to do with stalled cherry-picks? There are some which have
should go into 6.8 but waiting to be integrated into 6.9 which is closed
now, for example https://codereview.qt-project.org/c/qt/qtbase/+/641073


Christian

--
Development mailing list
Development at qt-project.org
https://lists.qt-project.org/listinfo/development
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20251013/046dab83/attachment-0001.htm>