[Development] Cherry picking to replace a change set

Thiago Macieira thiago.macieira at intel.com
Sat Aug 31 23:37:13 CEST 2013

On sábado, 31 de agosto de 2013 21:24:21, Samuel Gaist wrote:
> 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 ?

The correct work flow would have been to have one commit that does one thing 
only. Then you could have cherry-picked it in its entirety.

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/20130831/0525fe6b/attachment.sig>

More information about the Development mailing list