[Development] Cherry picking to replace a change set

Thiago Macieira thiago.macieira at intel.com
Sat Aug 31 00:34:23 CEST 2013

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.

Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20130830/e310b7c8/attachment.sig>

More information about the Development mailing list