+1 to (y). It is good to take advantage that some people here know well the branches that have to be merged.
It is faster and more practical to clean IP to the merged codebase than to do several audits. Also it would be really nice to just finish migrating the Oracle code that has to be migrated. Pedro. --- On Wed, 8/31/11, Eike Rathke wrote: ... > > So, we can choose: > > x) first identify and remove license incompatible code to > be pointed to > clashes when the CWSs will be integrated, > additionally lookout for > new license incompatible code when > integrating CWSs thereafter, or > > y) first integrate all CWSs, note down new license > incompatible code the > CWS introduces, and after all CWSs are > integrated start the clean-up > of the entire tree. CWSs rarely introduce > new external code, so new > code that would be covered by an > incompatible license should be an > exemption. > > I'd favour y) because we wouldn't have to deal with > additional merge > conflicts as would be the case with x). > > Eike > > -- > PGP/OpenPGP/GnuPG encrypted mail preferred in all private > communication. > Key ID: 0x293C05FD - 997A 4C60 CE41 0149 0DB3 9E96 > 2F1A D073 293C 05FD >
