There was probably nothing wrong with my changes at all, but I
got an error when I tested updating from the update stream from
another image, so I decided that I should revert the changes until
I was confident that they worked properly in the update stream.

Obviously I don't know what I'm doing with the update stream :-/

I any case, I *am* still getting failures on updates from an
image that does include my recent ToolBuilder changes, so there
is still a problem.

Thanks for your help, and I'll try to get the remaining problems
sorted out as soon as possible.

Dave


On Sat, Mar 05, 2011 at 05:01:35PM +0100, Levente Uzonyi wrote:
> On Sat, 5 Mar 2011, David T. Lewis wrote:
> 
> >Thanks, I'm afraid I have completely broken the update stream at the
> >moment. I'm trying to revert my ToolBuilder changes, which I should
> 
> It works for me.
> 
> >not have put into trunk in the first place.
> >
> >What is the correct way to fix this?
> 
> I don't see what's wrong with the changes, but if you want to revert 
> something, then update your image and then revert changes by hand and 
> finally save the changes to the Trunk.
> 
> 
> Levente
> 
> >
> >Dave
> >
> >On Sat, Mar 05, 2011 at 04:35:28PM +0100, Levente Uzonyi wrote:
> >>On Sat, 5 Mar 2011, commits at source.squeak.org wrote:
> >>
> >>>David T. Lewis uploaded a new version of ToolBuilder-Morphic to project
> >>>The Trunk:
> >>>http://source.squeak.org/trunk/ToolBuilder-Morphic-dtl.72.mcz
> >>
> >>This won't work, because both dtl.71 and dtl.72 have the same ancestor, so
> >>the update process will try to merge the two.
> >>
> >>
> >>Levente
> >>
> >>>
> >>>==================== Summary ====================
> >>>
> >>>Name: ToolBuilder-Morphic-dtl.72
> >>>Author: dtl
> >>>Time: 5 March 2011, 10:29:07.343 am
> >>>UUID: 3e543824-efc3-48c3-8f87-8656c3eeb6f2
> >>>Ancestors: ToolBuilder-Morphic-mtf.70
> >>>
> >>>Revert to ToolBuilder-Morphic-mtf
> >>>
> >>>=============== Diff against ToolBuilder-Morphic-mtf.70 ===============
> >>>
> >>>
> >>>
> >
> >