[Development] Cherry picking to replace a change set

Thiago Macieira thiago.macieira at intel.com
Sun Sep 1 00:08:56 CEST 2013


On sábado, 31 de agosto de 2013 23:45:32, Samuel Gaist wrote:
> First commit -> Original bug fix (in the case the common code that corrects
> the bug in Qt 4) 
> New commit with same id -> further corrections

Each commit has a different Change-Id.

Of course, each commit must stand on its own and be self-contained (it has to 
compile and should hopefully pass all tests). If you have to choose between 
atomicity and self-containment, prefer self-containment.

That's why I said earlier that removing parts of a patch that do not apply to 
Qt 4 is acceptable when backporting.

-- 
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/000b0f1d/attachment.sig>


More information about the Development mailing list