On Wed, Mar 22, 2017 at 02:39:41PM -0700, Eliot Miranda wrote:
> On Wed, Mar 22, 2017 at 2:17 PM, David T. Lewis <lewis at mail.msen.com> wrote:
> 
> > On Wed, Mar 22, 2017 at 08:21:06PM +0000, commits at source.squeak.org wrote:
> > > Eliot Miranda uploaded a new version of Kernel to project The Trunk:
> > > http://source.squeak.org/trunk/Kernel-eem.1067.mcz
> > >
> > > ==================== Summary ====================
> > >
> > > Name: Kernel-eem.1067
> > > Author: eem
> > > Time: 22 March 2017, 1:20:50.066536 pm
> > > UUID: 0073e975-c0c9-4923-9702-88e51890ae33
> > > Ancestors: Kernel-eem.1066
> > >
> > > Add CompiledCode and CompiledBlock to the package explciitly, now that
> > the script has created them. Provide the class comments.
> > >
> >
> > To confirm - trunk updates are going smoothly :-)
> >
> > One temporary glitch is that the update to Kernel-eem.1067 is generating a
> > merge
> > request dialog. I'm not certain, but I think that this would go away with
> > an
> > additional update map to force update from Kernel-eem.1065 to
> > Kernel-eem.1067.
> >
> 
> Damn, and I thought I'd figured out a way to get away with one update map
> :-).  So how to I generate the intermediate map and what version number
> should it receive?
> 

I'm not sure I have this right, so hopefully someone else can confirm or
correct me. But I think this is what is happening:

- The update-eem.400 update map loads Kernel-eem.1065, which is the version
immediately before the class hierarchy changes.

- Kernel-eem.1066 (and any later package) has the package prefix that changes
the class hierarchy. As of 1066, the changes have been made in the preamble
but not yet committed, so the package is dirty after loading 1066.

- Kernel-eem.1077 commits the actual changes. The package is dirty at this
point, hence the merge dialog.

Kernel-eem-1077 contains the prefix that makes the changes, and also the
actual changes. So I am guessing that if we add update-xxx.401 and have it
point directly to Kernel-eem.1077, then this would probably avoid the
merge dialog. But I have not tried it so I am not sure.

Dave