<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div dir="ltr">Hi Christophe,<br><div dir="ltr"><br></div><div dir="ltr"><br><blockquote type="cite">On Jan 25, 2020, at 4:38 AM, Thiede, Christoph <Christoph.Thiede@student.hpi.uni-potsdam.de> wrote:<br><br></blockquote></div><blockquote type="cite"><div dir="ltr">
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<div style="color: rgb(33, 33, 33); background-color: rgb(255, 255, 255); text-align: left;" dir="auto">
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?</div></div></blockquote><div><br></div>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.<div><br></div><div>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<br><div><br><blockquote type="cite"><div dir="ltr">
<div style="color: rgb(33, 33, 33); background-color: rgb(255, 255, 255); text-align: left;" dir="auto">
And btw, is it also intended that Kernel-eem.1294 has two ancestors? :)</div></div></blockquote><div><br></div>It’s an accident of merging.<div><br><blockquote type="cite"><div dir="ltr">
<div style="color: rgb(33, 33, 33); background-color: rgb(255, 255, 255); text-align: left;" dir="auto">
Best,</div>
<div style="color: rgb(33, 33, 33); background-color: rgb(255, 255, 255); text-align: left;" dir="auto">
Christoph</div>
<div style="color: rgb(33, 33, 33); background-color: rgb(255, 255, 255); text-align: left;" dir="auto">
<br>
</div>
<div style="color: rgb(33, 33, 33); background-color: rgb(255, 255, 255); text-align: left;" dir="auto">
<br>
</div>
<div id="id-d701f76e-0527-4c76-aa6b-c167ca7f2aeb" class="ms-outlook-mobile-reference-message">
<div style="font-family: sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"><br>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg"><strong>Von:</strong> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von Eliot Miranda <eliot.miranda@gmail.com><br>
<strong>Gesendet:</strong> Samstag, 25. Januar 2020, 03:19<br>
<strong>An:</strong> The general-purpose Squeak developers list<br>
<strong>Betreff:</strong> Re: [squeak-dev] The Inbox: Kernel-eem.1295.mcz<br>
</div>
<br>
<meta content="text/html; charset=utf-8">
<div dir="ltr">
<div dir="ltr"><br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Fri, Jan 24, 2020 at 12:38 PM Thiede, Christoph <<a href="mailto:Christoph.Thiede@student.hpi.uni-potsdam.de">Christoph.Thiede@student.hpi.uni-potsdam.de</a>> wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex; border-left-width:1px; border-left-style:solid; border-left-color:rgb(204,204,204); padding-left:1ex">
<div>
<div dir="ltr">
<div id="gmail-m_2631925276338682454x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif">
<p>Is the history clean? This commit does not really depend on Kernel-eem.1294, does it?</p>
</div>
</div>
</div>
</blockquote>
<div><br>
</div>
<div>No. I just committed it straight after committing 1294.</div>
<div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex; border-left-width:1px; border-left-style:solid; border-left-color:rgb(204,204,204); padding-left:1ex">
<div>
<div dir="ltr">
<div id="gmail-m_2631925276338682454x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif">
<div id="gmail-m_2631925276338682454x_Signature">
<div id="gmail-m_2631925276338682454x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif,EmojiFont,"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols">
<div name="x_divtagdefaultwrapper">
<div>
<div id="gmail-m_2631925276338682454x_Item.MessagePartBody">
<div id="gmail-m_2631925276338682454x_Item.MessageUniqueBody" style="font-family:wf_segoe-ui_normal,"Segoe UI","Segoe WP",Tahoma,Arial,sans-serif,serif,EmojiFont">
<div dir="ltr">
<div id="gmail-m_2631925276338682454x_divtagdefaultwrapper"><font face="Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols">
<div id="gmail-m_2631925276338682454x_Signature">
<div style="margin:0px"><font style="font-family:Calibri,Arial,Helvetica,sans-serif,serif,EmojiFont"></font></div>
</div>
</font></div>
</div>
</div>
</div>
</div>
<div><font size="2" color="#808080"></font></div>
</div>
</div>
</div>
</div>
<hr style="display:inline-block; width:98%">
<div id="gmail-m_2631925276338682454x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>Von:</b> Squeak-dev <<a href="mailto:squeak-dev-bounces@lists.squeakfoundation.org" target="_blank">squeak-dev-bounces@lists.squeakfoundation.org</a>>
im Auftrag von <a href="mailto:commits@source.squeak.org" target="_blank">commits@source.squeak.org</a> <<a href="mailto:commits@source.squeak.org" target="_blank">commits@source.squeak.org</a>><br>
<b>Gesendet:</b> Freitag, 24. Januar 2020 21:09:17<br>
<b>An:</b> <a href="mailto:squeak-dev@lists.squeakfoundation.org" target="_blank">
squeak-dev@lists.squeakfoundation.org</a><br>
<b>Betreff:</b> [squeak-dev] The Inbox: Kernel-eem.1295.mcz</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt">
<div>A new version of Kernel was added to project The Inbox:<br>
<a href="http://source.squeak.org/inbox/Kernel-eem.1295.mcz" target="_blank">http://source.squeak.org/inbox/Kernel-eem.1295.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Kernel-eem.1295<br>
Author: eem<br>
Time: 24 January 2020, 12:09:14.247651 pm<br>
UUID: 1f1fc6c8-7160-4101-9c48-56ec5784616f<br>
Ancestors: Kernel-eem.1294<br>
<br>
Fix comment typo for perform:with:with:with:with:with:<br>
<br>
=============== Diff against Kernel-eem.1294 ===============<br>
<br>
Item was changed:<br>
----- Method: Object>>perform:with:with:with:with:with: (in category 'message handling') -----<br>
perform: aSymbol with: firstObject with: secondObject with: thirdObject with: fourthObject with: fifthObject<br>
"Send the selector, aSymbol, to the receiver with the given arguments.<br>
+ Fail if the number of arguments expected by the selector is not five.<br>
- Fail if the number of arguments expected by the selector is not four.<br>
Primitive. Optional. See Object documentation whatIsAPrimitive."<br>
<br>
<primitive: 83><br>
^ self perform: aSymbol withArguments: { firstObject. secondObject. thirdObject. fourthObject. fifthObject }!<br>
<br>
<br>
</div>
</span></font></div>
<br>
</blockquote>
</div>
<br clear="all">
<div><br>
</div>
-- <br>
<div dir="ltr" class="gmail_signature">
<div dir="ltr">
<div><span style="font-size:small; border-collapse:separate">
<div>_,,,^..^,,,_<br>
</div>
<div>best, Eliot</div>
</span></div>
</div>
</div>
</div>
<br>
</div>
<span></span><br></div></blockquote></div></div></div></div></body></html>