On 26-09-2013, at 5:44 PM, Nicolas Cellier <nicolas.cellier.aka.nice at gmail.com> wrote:

> OK tim, I have commited version 178 with your changes but scanSelector and compose*...
> I have also moved breakAtSpace initialization elsewhere because it is still required.

Right - the only problem now is that doing an 'update' results in merge issues in a couple of places and the MCConflict code seems to be a bit broken! If you try to do the 'all newer' it fails with a complaint about dNU: fullTimeStamp.

I don't think we caused *that* one!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: SqueakDebug.log
Type: application/octet-stream
Size: 16412 bytes
Desc: not available
Url : http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20130926/12c6b717/SqueakDebug.obj
-------------- next part --------------


tim
--
tim Rowledge; tim at rowledge.org; http://www.rowledge.org/tim
Useful random insult:- S  p  a  c  e  d   o  u  t .