incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mathias Bauer <Mathias_Ba...@gmx.net>
Subject Re: [code][repo] Integration of CWSs
Date Tue, 06 Sep 2011 22:28:29 GMT
Hi Eike,

Am 06.09.2011 18:50, schrieb Eike Rathke:

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

I agree with you in that point - OTOH we shouldn't integrate cws into
the 3.4 code line that don't belong there. I hope you are talking only
about cws that should become a part of 3.4.

Regards,
Mathias

Mime
View raw message