Details
-
Bug
-
Resolution: Fixed
-
P2: Important
-
None
-
dev
-
None
-
-
5
-
a4934f9b9 (dev)
Description
QTQAINFRA-4763 changed the API change review scripts to produce one commit per Qt module, within each git module. Previously, api-review-gen supported updating the monolithic commit per git module when a new version of the branch on its way to release was available. However, that's broken by having one commit per Qt module: only the last commit in the branch is available to git commit --amend, so the update can't fix up the earlier commits. This has severely broken the update process for API change reviews.
This can be fixed by making each new commit, of a Qt module, be a git commit --fixup for the earlier commit for the same Qt module (when there is one), then ending the process with a git rebase --autosquash.
Attachments
Issue Links
- Is tested by
-
QTBUG-114214 Qt 6.6 API Change Review
- Closed
- resulted from
-
QTQAINFRA-4763 Teach API change review scripts to split on Qt module rather than git module
- Closed
For Gerrit Dashboard: QTQAINFRA-5757 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
533104,5 | Fix --amend and --replace for api-review-gen | dev | qt/qtqa | Status: MERGED | +2 | 0 |