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

staging doesn't deal well with forced pushes

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • P3: Somewhat important
    • None
    • 2011q3
    • Gerrit

    Description

      we had some forced fun on the qtbase/containers branch. the result was that staging the next change was rejected with "requires recursive merge". once i made a forced push to staging as well, things were fine again.

      so it would be good if the staging logic could detect rewinds of the target branch and rewind the statging branch, too (and on the way rebase all staged changes, which can cause them to be unstaged with a merge conflict). this should probably happen at the time of the forced pushing already, and latest when the integration starts (when no new staging attempts triggered the rebase already). consider the integration branch, too.

      Attachments

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

        Activity

          People

            jujokini Jukka Jokiniva
            buddenha Oswald Buddenhagen
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:

              Gerrit Reviews

                There are no open Gerrit changes