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

Enable inexact rename detection for cherry-pick bot

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Unresolved
    • P2: Important
    • None
    • None
    • Cherry-pick bot
    • None

    Description

      It leads to fewer conflicts. This cherry-pick, e.g..:

      https://codereview.qt-project.org/c/qt/tqtc-qtdeclarative/+/408261

      Does not fail locally when inexact rename detection is enabled (merge.renamelimit=20000).

      And this:

      https://codereview.qt-project.org/c/qt/tqtc-qtdeclarative/+/408551

      at least finds the correct file and fails only the actually-conflicting stuff (m_mgr), putting proper conflict markers in the correct files.

      Attachments

        Issue Links

          split to

          Bug - A problem which impairs or prevents the functions of the product. QTQAINFRA-5010 Inexplicable conflicts from cherry-pick bot compared to local cherry-pick -x

          • P2: Important - Urgent, should be fixed, but will not stop the release.
          • Reported
          No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

              jujokini Jukka Jokiniva
              mmutz Marc Mutz
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:

                Gerrit Reviews

                  There are no open Gerrit changes