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

Changes with submodule conflict get stuck in STAGING state

    XMLWordPrintable

Details

    • Bug
    • Resolution: Cannot Reproduce
    • P1: Critical
    • None
    • 2012q2
    • Gerrit

    Description

      If a user attempts to stage a change which contains a modification to a git submodule, and that change can't be cherry-picked due to conflicts in that submodule, the change will stay in "STAGING" state forever.

      Observed on https://codereview.qt-project.org/28052 , for example.

      Attachments

        Issue Links

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

          Activity

            People

              ishaataj Ismo Haataja
              rmcgover Rohan McGovern (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes