[Sugar-devel] Engineering Team

[Simon Schampijer]

On 11/22/2010 11:46 AM, James Cameron wrote:
> On Mon, Nov 22, 2010 at 10:29:32AM +0000, Daniel Drake wrote:
>> On 22 November 2010 00:02, James Cameron<quozl at laptop.org>  wrote:
>>> I don't think this is true. ?Some patches, in particular my network
>>> disconnect fix, are in 0.84 but not in trunk.
>>
>> Sounds like an oversight, do you know who committed it?
>
> fcb1cec by Sayamindu.
>
>> The plan was for only upstream stuff:
>> http://www.mail-archive.com/sugar-devel@lists.sugarlabs.org/msg10809.html
>
> "There may be exceptions, but in general we'll only be taking patches
> that are already in master."
>
> This was an exception then.
>

Yes, I think this was an exception. OLPCA have been making sure over the 
last months that all the patches did land in master already. And we 
reduced as well parts that made it harder to reach those goals (e.g. the 
new activity version).

Regards,
    Simon