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

gerrit is applying changes twice on staging-approve

    XMLWordPrintable

Details

    • Bug
    • Resolution: Done
    • P1: Critical
    • 2011q4
    • 2011q4
    • Gerrit
    • V2.2.1-NQT-003

    Description

      Noticed this from a comment on http://codereview.qt-project.org/9232 .

      Since yesterday's gerrit upgrade, commits seem to be applied twice on a successful staging-approve. Once with the content, and once as an empty commit with the message only.

      For example, see this output of git log --stat on qt/qtsystems master.

      commit 9f5cc1e38aae5b0e1a42e7b3df4e52f00c87dbb1
      Author: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
      Date:   Fri Nov 18 15:20:00 2011 +1000
      
          Add autotest for signal/slot ordering
          
          Auto test to verify that signal and slot ordering
          works properlly.  Functions that have a return value
          should return the result before signals emitted later.
          
          Change-Id: I43e6d32392f4f0565161220ee2397c46bcbda578
          Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
          Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
      
      commit 05d388db61d47e4da7541a484d9442b06d4396ef
      Author: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
      Date:   Fri Nov 18 15:20:00 2011 +1000
      
          Add autotest for signal/slot ordering
          
          Auto test to verify that signal and slot ordering
          works properlly.  Functions that have a return value
          should return the result before signals emitted later.
          
          Change-Id: I43e6d32392f4f0565161220ee2397c46bcbda578
          Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
          Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
      
       .../client/tst_qservicemanager_ipc.cpp             |   18 ++++++++++++++++--
       tests/auto/qservicemanager_ipc/service/main.cpp    |   16 ++++++++++++++++
       2 files changed, 32 insertions(+), 2 deletions(-)
      

      The history of our repositories will be damaged like this until the bug is fixed.

      Attachments

        Issue Links

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

          Activity

            People

              seahumad [BB] Sergio Ahumada (Inactive)
              rmcgover Rohan McGovern (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes