Re: Status of TODO-1.6

Quoting "Hyrum K. Wright" <hyrum_wright_at_mail.utexas.edu>:

> The following items are listed as blocking the branch of 1.6.x:
> * #3334: Tree conflicts "merry-go-round" about update updating the base.
> Julian Foad is working on this. Done for when victim is a file, still
> doing for when victim is a directory.
>
> Julian, I understand that you are working on this. Do you have an
> estimate for
> when you might be finished?

I started to investigate this, but switched to the serf issue below.

>
> * Test failures in tree conflicts tests on RA-Serf:
> <http://www.mobsol.be/buildbot/x86-macosx-gnu%2520shared%2520daily%2520ra_serf/builds/96>
>
> Who's looking at this? Serf people? Tree conflicts folks? Nobody?

I'm looking into this bug, trying to reproduce it on OS X 10.5. The
linking to the 64-bit apache hasn't worked for me yet. But I found
Jeremy Whitlock's "universal build" script for 1.5.x, which seems to
employ all the magic I need.

Steve

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=992471