[Development] Cherry picking to replace a change set

Samuel Gaist samuel.gaist at edeltech.ch
Sat Aug 31 21:24:21 CEST 2013

On 31 août 2013, at 00:34, Thiago Macieira wrote:

> On sábado, 31 de agosto de 2013 00:12:42, Samuel Gaist wrote:
>> Hi,
>> Is there a process to cherry pick a commit from Qt 5 back to Qt 4 and
>> replace a change set (implementing the same correction) without creating a
>> new submission ?
> If you're adapting the change so that it compiles or simply fixing a conflict, 
> then it's fine to do it in the same change. For example, in Qt 5 the atomics 
> require a .load() and .store(), but there are no such methods in Qt 4. That 
> would be an acceptable change.
> It's also acceptable to leave out part of the change if it doesn't apply to Qt 
> 4, like change to a source that doesn't exist.
> If you're doing more than trivial modifications, then it needs to be a new 
> change, and it needs to be justified why you're not doing it in Qt 5 first.

Just to be sure (for a future work),for example https://codereview.qt-project.org/#change,63526 and 
https://codereview.qt-project.org/#change,63699 that try to fix Bug-1180. The bug
applies to both 4 and 5. But in Qt5 the same fix also uncovered another problem that I tried to 
address within the same patch set. So the correct work flow would have been to first fix all the problems in Qt 5, cherry pick
and only apply and submit the needed changes to Qt 4 ?

More information about the Development mailing list