Hi Christophe,


>> On Jan 25, 2020, at 4:38 AM, Thiede, Christoph <Christoph.Thiede at student.hpi.uni-potsdam.de> wrote:
> 
> But wouldn't you want to have each independent inbox commit be based on the latest Trunk version? Unless I misunderstood every admonition I have been told since I started contributing to Squeak, the current ancestry makes it impossible to merge Kernel-eem.1295 into Trunk *without* Kernel-eem.1294, or am I wrong?

Surely when we merge we can choose to do an automatic merge or a manual cherry-picking merge right?  So if I were merging something from inbox I would first look at the diff between the version in question and its immediate ancestor(s) and then either cherry pick or attempt an automatic merge as appropriate.

There are lots of ideas in inbox kernel right now and that situation will continue until we get the release out.  The important thing is to keep the ideas flowing and being able to be seen in inbox, not that inbox is well organized.  Or should I spend more time on submitting to inbox a

> And btw, is it also intended that Kernel-eem.1294 has two ancestors? :)

It’s an accident of merging.

> Best,
> Christoph
> 
> 
> 
> Von: Squeak-dev <squeak-dev-bounces at lists.squeakfoundation.org> im Auftrag von Eliot Miranda <eliot.miranda at gmail.com>
> Gesendet: Samstag, 25. Januar 2020, 03:19
> An: The general-purpose Squeak developers list
> Betreff: Re: [squeak-dev] The Inbox: Kernel-eem.1295.mcz
> 
> 
> 
>>> On Fri, Jan 24, 2020 at 12:38 PM Thiede, Christoph <Christoph.Thiede at student.hpi.uni-potsdam.de> wrote:
>> Is the history clean? This commit does not really depend on Kernel-eem.1294, does it?
>> 
> 
> No.  I just committed it straight after committing 1294.
>  
>> 
>> Von: Squeak-dev <squeak-dev-bounces at lists.squeakfoundation.org> im Auftrag von commits at source.squeak.org <commits at source.squeak.org>
>> Gesendet: Freitag, 24. Januar 2020 21:09:17
>> An: squeak-dev at lists.squeakfoundation.org
>> Betreff: [squeak-dev] The Inbox: Kernel-eem.1295.mcz
>>  
>> A new version of Kernel was added to project The Inbox:
>> http://source.squeak.org/inbox/Kernel-eem.1295.mcz
>> 
>> ==================== Summary ====================
>> 
>> Name: Kernel-eem.1295
>> Author: eem
>> Time: 24 January 2020, 12:09:14.247651 pm
>> UUID: 1f1fc6c8-7160-4101-9c48-56ec5784616f
>> Ancestors: Kernel-eem.1294
>> 
>> Fix comment typo for perform:with:with:with:with:with:
>> 
>> =============== Diff against Kernel-eem.1294 ===============
>> 
>> Item was changed:
>>   ----- Method: Object>>perform:with:with:with:with:with: (in category 'message handling') -----
>>   perform: aSymbol with: firstObject with: secondObject with: thirdObject with: fourthObject with: fifthObject
>>          "Send the selector, aSymbol, to the receiver with the given arguments.
>> +        Fail if the number of arguments expected by the selector is not five.
>> -        Fail if the number of arguments expected by the selector is not four.
>>          Primitive. Optional. See Object documentation whatIsAPrimitive."
>>   
>>          <primitive: 83>
>>          ^ self perform: aSymbol withArguments: { firstObject. secondObject. thirdObject. fourthObject. fifthObject }!
>> 
>> 
> 
> 
> -- 
> _,,,^..^,,,_
> best, Eliot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20200125/8b9b966c/attachment.html>