On 31 août 2013, at 23:37, Thiago Macieira wrote: > 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
So it should have been: 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 ? _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
