I assume you mean you want to fix the timeout, not the conflict (since
it looks like you have the correct response for the conflict).

Hopefully it just needs to be increased.  Trunk has been feeling sluggish.


On Wed, Jan 22, 2014 at 3:35 PM, Frank Shearar <frank.shearar at gmail.com> wrote:
> On 22 January 2014 20:27, Chris Muller <asqueaker at gmail.com> wrote:
>> Hi Frank, when I downloaded the Squeak4.5.zip located at
>>
>>    http://build.squeak.org/job/ReleaseSqueakTrunk/lastSuccessfulBuild/
>>
>> it is still -13352 image, but that page says it was built yesterday.
>>
>> I thought I would find the latest trunk updates there?
>
> It's because the build doesn't blow up properly when things go wrong.
> If you look at http://build.squeak.org/job/SqueakTrunk/773/console
> you'll see this:
>
> 2014-01-22T17:01:33.898+01:00: Updating http://source.squeak.org/trunk
> 2014-01-22T17:01:40.724+01:00: Checking http://source.squeak.org/trunk
> 2014-01-22T17:02:53.152+01:00: Conflict; choosing remote:
> 2014-01-22T17:02:53.176+01:00: Utilities class>>updateFromServer
> 2014-01-22T17:02:53.192+01:00: Resolved? true
>
> SocketStream>>signalTimeout
> [] in SocketStream>>waitForData
> Socket>>waitForDataFor:ifClosed:ifTimedOut:
> SocketStream>>waitForData
>
> I flagged this up, er, day before yesterday?, but haven't had a chance
> to fix the problem. It's a very serious problem: until it's fixed, you
> have no idea what kind of image will come out the SqueakTrunk job -
> either 4.5-13352, or a fully updated one.
>
> frank