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

Gerrit should not create new patch-sets when staging

    XMLWordPrintable

Details

    • Bug
    • Resolution: Duplicate
    • Not Evaluated
    • None
    • master
    • Gerrit
    • None

    Description

      It's very painful for integrators like me.

      I want to have them in order(from up to down), but after first stage and fail. Their patch set numbers got bumped.

      When I tried to get new round of submodule update which based on previous "-fetch-ref" which I used latest patch set number, refs/changes/03/265403/3, then got failure

      To ssh://codereview.qt-project.org:29418/qt/qt5
       ! [remote rejected]     5ca756ff68f0517ee77e138d00b4b94f286ae211 -> refs/for/5.12 (commit aaf43ef: you are not allowed to upload merges)
      error: failed to push some refs to 'ssh://qt_submodule_update_bot@codereview.qt-project.org:29418/qt/qt5'
      

      If I use previous patch set number, for example, refs/changes/03/265403/1, supermodule update script works fine. But when staging in gerrit, I got merge conflict there.

      Attachments

        Issue Links

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

          Activity

            People

              gerrit-admin Gerrit Admin
              liaqi Liang Qi
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes