On Tuesday, 10 de January de 2012 11.57.35, shane.kea...@accenture.com wrote: > 1. author submits change to the version they normally work on (4.8 or 5.0) > 2. code review happens, change accepted > 3. CI happens, change integrated > 4. author cherry-picks to the other repository, resolving any conflicts & > test on their preferred platform 5. code review - if there weren't > conflicts then this should often be a formality by the previous approvers > 6. CI happens - this will pick up if the change isn't compatible with the > new/old architecture. (if the reviewers missed it) > > My experience is that cherry-picking QtCore and QtNetwork changes is usually > OK, except for autotests which conflict due to path changes
I agree, Shane.
Starting from either repository is fine.
What's important is that all bugfixes that go into 4.8 also go into 5.0, if
they are relevant.
--
Thiago Macieira - thiago.macieira (AT) intel.com
Software Architect - Intel Open Source Technology Center
Intel Sweden AB - Registration Number: 556189-6027
Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden
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
