[squeak-dev] The Trunk: ToolBuilder-Morphic-dtl.72.mcz

David T. Lewis lewis at mail.msen.com
Sat Mar 5 15:48:31 UTC 2011


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
not have put into trunk in the first place.

What is the correct way to fix this?

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 ===============
> >
> >
> >



More information about the Squeak-dev mailing list