Details
-
Bug
-
Resolution: Done
-
P2: Important
-
None
-
production
-
None
-
731ba877dde5bed3481b28d3cb24de436f1eea04 (qtqa/gerrit-plugin-qt-workflow/v3.0-based)
Description
This is a corner case, but still a bug
- Make changes on 5.x branch and get them merged.
- Make cherry-picks of the previous changes on 5.x.y branch
- Merge 5.x branch into 5.x.y
- => When the merge change gets integrated, also the status of the cherry-picks is updated to merged. The git is ok, but Gerrit is in strange state. The patches of original changes got added to the cherry-picks.
Here is the real-life case: https://codereview.qt-project.org/c/qt/tqtc-qt5/+/282152
(Status of the changes was later changed manually to abandoned)
Attachments
Issue Links
- mentioned in
-
Page Loading...
For Gerrit Dashboard: QTQAINFRA-3374 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
290397,6 | Keep status of non-staged cherry-picked changes on build approve | v3.0-based | qtqa/gerrit-plugin-qt-workflow | Status: MERGED | +2 | 0 |