<div dir="ltr"><div class="gmail_default" style="font-size:small">Hi Marcel,</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">Thanks. That all makes sense.</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">Ron</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jul 20, 2020 at 9:52 AM Marcel Taeumel <<a href="mailto:marcel.taeumel@hpi.de">marcel.taeumel@hpi.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div id="gmail-m_-510759248113014623__MailbirdStyleContent" style="font-size:10pt;font-family:Arial;color:rgb(0,0,0)">
Hi Ron.<div></div>
<div><br></div><div>> <span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"> </span><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Did I get that right? </span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Yes. And a version gets also moved to Treated if that contribution was already merged otherwise, maybe manually. Or if it is a duplicate. Or no longer valid. :-)</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">> </span><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">The number that it picks should be an acceptable number for sending changes? </span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Yes, it should be.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">> Should we also verify that the number is greater than the last number in Inbox?</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Your author initials ... kind of ... represent their own space for version numbers -- except that, for each new version, you should consider the biggest number in current Trunk. +1. :-) We do that to compute the overall build number by adding up all the most recent version numbers from all packages in the "update" map (aka. Monticello Configuration). "Squeak-Version" is the package for correcting that build number, e.g., when removing a package.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">So, conflicts mostly happen for a single author who forgot about a version in the local package cache or Inbox or Treated. We can still resolve those conflicts because each version has a UUID. However, the more compact "author.number" form -- stored in the MCZ filename -- is used to find the most recent version without having to open up the MCZ file. The number is not that UUID for the above reason and to keep the file name human-readable. Sort-by-name quickly gives you the name of the newest version.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Duplicate version numbers with different authors are possible BUT should be merged as quickly as possible. :-) So "abc.123" and "def.123" should be merged to "foo.124" to not confuse the in-image update process.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Here is more information: </span><span style="font-size:10pt;font-family:Arial,Helvetica,sans-serif"><a href="https://squeak.org/development_process/" style="font-size:10pt" target="_blank">https://squeak.org/development_process/</a></span></div><div><br></div><div>In Trunk we have this:</div><div><br></div><div><span style="font-size:13.3333px">MonticelloConfigurations-mt.162</span><br></div><div><span style="font-size:13.3333px">MonticelloConfigurations-dtl.161 --- UUID 67fc</span><br></div><div><span style="font-size:13.3333px">MonticelloConfigurations-mt.160</span><br></div><div>MonticelloConfigurations-mt.159<span style="font-size:13.3333px"><br></span></div><div><span style="font-size:13.3333px">...</span></div><div><span style="font-size:13.3333px"><br></span></div><div><span style="font-size:13.3333px">In Inbox we have this:</span></div><div><span style="font-size:13.3333px"><br></span></div><div><span style="font-size:13.3333px">MonticelloConfigurations-RJT.163 --- for </span><span style="font-size:10pt">MonticelloConfigurations-mt.162 --- OK!</span></div><div><span style="font-size:10pt"><br></span></div><div><span style="font-size:13.3333px">MonticelloConfigurations-dtl.160 --- for MonticelloConfigurations-mt.159 --- OK!</span><br></div><div><span style="font-size:13.3333px">MonticelloConfigurations-dtl.161 --- UUID 303c --- for </span><span style="font-size:10pt">MonticelloConfigurations-dtl.160 --- NAME CONFLICT!</span><br></div><div><span style="font-size:13.3333px">MonticelloConfigurations-dtl.162 --- for MonticelloConfigurations-dtl.161 w/ </span><span style="font-size:10pt">UUID 303c --- ANCESTOR CONFLICT!</span><br></div><div><span style="font-size:13.3333px">MonticelloConfigurations-dtl.163 --- for </span><span style="font-size:10pt">MonticelloConfigurations-dtl.162 --- INDIRECT </span><span style="font-size:10pt">ANCESTOR CONFLICT!</span><br></div><div>MonticelloConfigurations-dtl.164 --- for <span style="font-size:10pt">MonticelloConfigurations-dtl.163 --- INDIRECT </span><span style="font-size:10pt">ANCESTOR CONFLICT!</span><span style="font-size:10pt"><br></span></div><div>MonticelloConfigurations-dtl.165 --- for <span style="font-size:10pt">MonticelloConfigurations-dtl.164 --- INDIRECT </span><span style="font-size:10pt">ANCESTOR CONFLICT!</span><span style="font-size:10pt"><br></span></div><div>MonticelloConfigurations-dtl.166 --- for <span style="font-size:10pt">MonticelloConfigurations-dtl.165 --- INDIRECT </span><span style="font-size:10pt">ANCESTOR CONFLICT!</span><span style="font-size:10pt"><br></span></div><div>MonticelloConfigurations-dtl.167 --- for <span style="font-size:10pt">MonticelloConfigurations-dtl.166 --- INDIRECT </span><span style="font-size:10pt">ANCESTOR CONFLICT!</span><span style="font-size:10pt"><br></span></div><div><br></div><div>Well, it is correct that improvements to existing inbox contributions build on those versions and not on the recent trunk. However, in this case, dtl.161 and dtl.162 introduced a hidden conflict in (file) name and ancestry, which renders all following dtl.* commits problematic. A manual merge would be necessary. All those conflicting versions should be moved to Treated after the merge of their contents.</div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Best,</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Marcel</span></div><blockquote type="cite" style="border-left-style:solid;border-width:1px;margin-top:20px;margin-left:0px;padding-left:10px;min-width:500px">
<p style="color:rgb(170,170,170);margin-top:10px">Am 20.07.2020 15:15:10 schrieb Ron Teitelbaum <<a href="mailto:ron@usmedrec.com" target="_blank">ron@usmedrec.com</a>>:</p><div style="font-family:Arial,Helvetica,sans-serif">
<div dir="ltr"><div class="gmail_default" style="font-size:10pt">Hi Marcel,</div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">Thanks for the suggestion. I wasn't aware of Treated but I went and looked it up. So things that are sent to Inbox are then moved to either Trunk if accepted or Treated if not accepted. Did I get that right? </div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">So someone that wants to contribute should load (or merge) the trunk latest version but also add Inbox and Treated as repositories to the package for automatic monticello numbering. Then save the change verifying that only their changes show up. The number that it picks should be an acceptable number for sending changes? Should we also verify that the number is greater than the last number in Inbox?</div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">Thanks!</div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">Ron</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jul 20, 2020 at 5:02 AM Marcel Taeumel <<a href="mailto:marcel.taeumel@hpi.de" target="_blank">marcel.taeumel@hpi.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex;min-width:500px"><div id="gmail-m_-510759248113014623gmail-m_8597387618312184739__MailbirdStyleContent" style="font-size:10pt;font-family:Arial;color:rgb(0,0,0)">
Hi Ron.<div><br></div><div>Thank you! =)</div><div><br></div><div>> <span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Realized after the save that the number it picked was a duplicate of other changes added to inbox.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Make sure to have all three repos in that package's repository group: Trunk, Inbox, Treated. Then the automatic version number calculation will work. Your local package cache will be considered, too.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">A small gap in a new version number is okay.</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt"><br></span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Best,</span></div><div><span style="font-family:Arial,Helvetica,sans-serif;font-size:10pt">Marcel</span></div><div></div>
<blockquote type="cite" style="border-left-style:solid;border-width:1px;margin-top:20px;margin-left:0px;padding-left:10px;min-width:500px">
<p style="color:rgb(170,170,170);margin-top:10px">Am 18.07.2020 19:55:41 schrieb Ron Teitelbaum <<a href="mailto:ron@usmedrec.com" target="_blank">ron@usmedrec.com</a>>:</p><div style="font-family:Arial,Helvetica,sans-serif">
<div dir="ltr"><div class="gmail_default" style="font-size:10pt">Hi All,</div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">I Added a fix but not sure I did it correctly. Inbox has other non merged changes on it for Monticello Configurations. Realized after the save that the number it picked was a duplicate of other changes added to inbox.<br></div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">my change: "</div><div class="gmail_default" style="font-size:10pt">Name: MonticelloConfigurations-RJT.163<br>Author: RJT</div><div class="gmail_default" style="font-size:10pt">Time: 18 July 2020, 1:47:16.459316 pm<br>UUID: 87d7467d-cc80-7c4a-95a8-2a02c20366e1<br>Ancestors: MonticelloConfigurations-mt.162<br><br>Fix the up and down button (to change the load order) of Monticello Configurations so that it automatically selects the package that is moved. This allows you to push the button more than once without having to select the package again.<br></div><div class="gmail_default" style="font-size:10pt">"</div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">What should I have done in this situation? Do we just pick a later version number. I'm assuming here that we do not merge in others changes to your own change set. </div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">Thanks for your help.</div><div class="gmail_default" style="font-size:10pt"><br></div><div class="gmail_default" style="font-size:10pt">Ron Teitelbaum </div></div>
</div></blockquote></div><br>
</blockquote></div>
</div></blockquote></div></blockquote></div>