[Development] Cherry picking to replace a change set

[Samuel Gaist]

On 1 sept. 2013, at 00:08, Thiago Macieira wrote:

> 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.
> 
Ok

> 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.
> 
I try to avoid pushing something that doesn't compile (well... Just had back luck with my QFileInfo patch and iOS that wasn't yet there when i started it)

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

Ok

So the "multiple bug" fix of my example would be correct from a self-containement point of view ?