Details
-
Bug
-
Resolution: Unresolved
-
P2: Important
-
None
-
5.15, 6.2, 6.3
-
None
Description
The following cherry-picks had conflicts when cherry-pick bot created them:
- https://codereview.qt-project.org/c/qt/qtmultimedia/+/412252/1
- https://codereview.qt-project.org/c/qt/tqtc-qtmultimedia/+/412277/1
but a local git cherry-pick -x 8df415d5bcf23462bedb4cb7601b909851ee15dd succeeded without conflicts, and it seems it didn't even perform inexact rename detection:
~/Qt/qt5/qtmultimedia[tqtc/lts-6.2]$ git cherry-pick -x 8df415d5bcf23462bedb4cb7601b909851ee15dd Auto-merging src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp [detached HEAD ef1e13c72] QPulseAudioSource: fix UB (memcpy() called with nullptr dest) in read() Date: Thu May 19 12:02:04 2022 +0200 1 file changed, 6 insertions(+), 2 deletions(-)
vs.
~/Qt/qt5/qtmultimedia[tqtc/lts-5.15]$ git cherry-pick -x 8df415d5bcf23462bedb4cb7601b909851ee15dd Performing inexact rename detection: 100% (2060345/2060345), done. Auto-merging src/plugins/pulseaudio/qaudioinput_pulse.cpp [detached HEAD 84be719a2] QPulseAudioSource: fix UB (memcpy() called with nullptr dest) in read() Date: Thu May 19 12:02:04 2022 +0200 1 file changed, 6 insertions(+), 2 deletions(-)
for https://codereview.qt-project.org/c/qt/tqtc-qtmultimedia/+/412278/1
Git v2.25.1 on Ubuntu 20.04, no rerere, but merge.renamelimit=40000.
Q: Why doesn't the bot manage to create these picks w/o conflicts if they just go though locally?
Attachments
Issue Links
- split from
-
QTQAINFRA-4984 Enable inexact rename detection for cherry-pick bot
-
- Reported
-