Uploaded image for project: 'Qt Quality Assurance Infrastructure'
  1. Qt Quality Assurance Infrastructure
  2. QTQAINFRA-3374

Successful merge integration changes status of cherry-picks if changes-ids match

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Done
    • Icon: P2: Important P2: Important
    • None
    • production
    • Gerrit
    • None
    • 731ba877dde5bed3481b28d3cb24de436f1eea04 (qtqa/gerrit-plugin-qt-workflow/v3.0-based)

      This is a corner case, but still a bug

      1. Make changes on 5.x branch and get them merged.
      2. Make cherry-picks of the previous changes on 5.x.y branch
      3. 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)

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

            vsuomala Ville Suomala
            jujokini Jukka Jokiniva
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes