[squeak-dev] The Trunk: Monticello-dtl.685.mcz

David T. Lewis lewis at mail.msen.com
Sat Nov 10 00:48:10 UTC 2018


On Fri, Nov 09, 2018 at 06:11:59PM -0600, Chris Muller wrote:
> YO!!  Two versions for one feature?  Before I could even get my
> feedback submitted?
> 
> Somebody got a itchy commit finger there!    :(

I don't understand what you mean.

I put this in the inbox last Tuesday. Eliot said it looked nice.
Chris said "you read my mind", which I took to be positive feedback.
Bert sounded cautious and asked for my used case, which I provided.
Levente replied with another used case that seemed to make sense.

What other feedback should I have been waiting for?

Or are you saying that the original Monticello-dtl.685 version
should have been deleted, rather than merged and retained in trunk?
That does not sound right to me.

Confused,
Dave


> On Fri, Nov 9, 2018 at 6:05 PM <commits at source.squeak.org> wrote:
> >
> > David T. Lewis uploaded a new version of Monticello to project The Trunk:
> > http://source.squeak.org/trunk/Monticello-dtl.685.mcz
> >
> > ==================== Summary ====================
> >
> > Name: Monticello-dtl.685
> > Author: dtl
> > Time: 5 November 2018, 10:52:58.748205 pm
> > UUID: b31c1c5b-d61a-4810-8f97-5fdcaf062dc8
> > Ancestors: Monticello-eem.684
> >
> > MCVersionInspector has an 'Adopt' button to allow the selected version to be added to the parent or parents of a working version. Provide a 'Reparent' button to allow a selected version to become the sole parent of a working version. Adjust defaultExtent to accomodate the additional button.
> >
> > Motivated by the exercise of preparing to copy Chronology-Core versions from one repository into equivalent Chronology-Core.UTC versions in another repository (possibly trunk). In this scenario, it is helpful to be able to reparent a newly loaded Chronology-Core version from one repository to be the child of the last saved Chronology-Core.UTC version in another. The '.UTC' suffix in this case is intended to branch those versions from the trunk update stream, allowing later merge to trunk with branch history preserved.
> >
> > =============== Diff against Monticello-eem.684 ===============
> >
> > Item was changed:
> >   ----- Method: MCRepositoryInspector>>defaultExtent (in category 'morphic ui') -----
> >   defaultExtent
> > +       ^600 at 300!
> > -       ^450 at 300!
> >
> > Item was added:
> > + ----- Method: MCVersion>>reparent (in category 'actions') -----
> > + reparent
> > +       "Let aNode be the sole parent of this version"
> > +       self workingCopy reparent: self!
> >
> > Item was changed:
> >   ----- Method: MCVersionInspector>>buttonSpecs (in category 'morphic ui') -----
> >   buttonSpecs
> > +       ^#(
> > +               ('Refresh' refresh 'refresh the version-list')
> > -        ^ #(('Refresh' refresh 'refresh the version-list')
> >                 (Browse browse 'Browse this version' hasVersion)
> > +               (History history 'Browse the history of this version' hasVersion)
> > +               (Changes changes 'Browse the changes this version would make to the image' hasVersion)
> > +               (Load load 'Load this version into the image' hasVersion)
> > +               (Merge merge 'Merge this version into the image' hasVersion)
> > +               (Adopt adopt 'Adopt this version as an ancestor of your working copy' hasVersion)
> > +               (Reparent reparent 'Adopt this version as the sole ancestor of your working copy' hasVersion)
> > +               (Copy save 'Copy this version to another repository' hasVersion)
> > +               (Diff diff 'Create an equivalent version based on an earlier release' hasVersion)
> > +       )!
> > -                (History history 'Browse the history of this version' hasVersion)
> > -                (Changes changes 'Browse the changes this version would make to the
> > - image' hasVersion)
> > -                (Load load 'Load this version into the image' hasVersion)
> > -                (Merge merge 'Merge this version into the image' hasVersion)
> > -                (Adopt adopt 'Adopt this version as an ancestor of your working copy'
> > - hasVersion)
> > -                (Copy save 'Copy this version to another repository' hasVersion)
> > -                (Diff diff 'Create an equivalent version based on an earlier release'
> > - hasVersion))!
> >
> > Item was added:
> > + ----- Method: MCVersionInspector>>reparent (in category 'accessing') -----
> > + reparent
> > +       (self confirm:'Adopt ',self version info name, ' as the sole ancestor of your working copy?')
> > +               ifTrue: [self version reparent]!
> >
> > Item was added:
> > + ----- Method: MCWorkingAncestry>>reparent: (in category 'as yet unclassified') -----
> > + reparent: aNode
> > +       "Let aNode be the sole parent of this version"
> > +       ancestors := Array with: aNode
> > + !
> >
> > Item was added:
> > + ----- Method: MCWorkingCopy>>reparent: (in category 'operations') -----
> > + reparent: aVersion
> > +       "Let aNode be the sole parent of this version"
> > +       ancestry reparent: aVersion info.
> > +       self changed.!
> >
> >
> 


More information about the Squeak-dev mailing list