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

gerrit generates spurious conflict on staging-approve, merges the change, fails to mark as merged in database

    XMLWordPrintable

Details

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

    Description

      See revision 4 of this patch set http://codereview.qt-project.org/8131

      • I staged the change, it started testing as SHA1 c966da875ae514c3ce0491445a88011b60afa00d
      • Test succeeded, staging-approve was performed
      • The change in gerrit received both a "no regressions!" comment and a "merge conflict" comment. The change was not marked as merged. I am not sure what two commits were being merged when the conflict occurred.
      • Using git, it was verified that gerrit's master was now pointing at c966da875ae514c3ce0491445a88011b60afa00d (the tested and approved SHA1).

      Overall state: change is merged, but it has an incorrect "merge conflict" comment and is not marked as merged in the database.

      Attachments

        Issue Links

          relates to

          Bug - A problem which impairs or prevents the functions of the product. QTQAINFRA-389 gerrit is applying changes twice on staging-approve

          • P1: Critical - Urgent and Important, will STOP the release if matched with set FixVersion field. This includes regressions from the last version that are not edge cases; Data loss; Build issues; All but the most unlikely crashes/lockups/hanging; Serious usability issues and embarrassing bugs & Bugs critical to a deliverable. This is the highest possible priority for requirements.
          • Closed

          Bug - A problem which impairs or prevents the functions of the product. QTQAINFRA-389 gerrit is applying changes twice on staging-approve

          • P1: Critical - Urgent and Important, will STOP the release if matched with set FixVersion field. This includes regressions from the last version that are not edge cases; Data loss; Build issues; All but the most unlikely crashes/lockups/hanging; Serious usability issues and embarrassing bugs & Bugs critical to a deliverable. This is the highest possible priority for requirements.
          • Closed
          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