On quinta-feira, 13 de junho de 2013 16.32.24, Qi Liang wrote: > Hi, all, > > dev is for 5.2, and stable is for 5.1.1 and forward now. A commit has > already been merged in dev branch, I guess it means that we(or someone) > decided to have that feature for 5.2. But now, it was cherry-picked into > stable branch, then it will be duplicate when the merge happened between > stable and dev next time. > > Is it good practice? > > https://codereview.qt-project.org/55247 > https://codereview.qt-project.org/58617
It's unavoidable. If the commit was meant for dev and integrated, and only later did we realise we wanted it for stable, cherry-picking is necessary. If you realise the commit should be in stable before it integrates in dev, then abandon the dev change. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
