I have a patch about 80% done for skels, then to test.
On Dec 24, 2008, at 5:49, Julian Foad <julianfoad_at_btopenworld.com>
wrote:
> Author: julianfoad
> Date: Wed Dec 24 05:49:52 2008
> New Revision: 34921
>
> Log:
> * TODO-1.6: Update status of #3334.
>
> Modified:
> trunk/TODO-1.6
>
> Modified: trunk/TODO-1.6
> URL: http://svn.collab.net/viewvc/svn/trunk/TODO-1.6?pathrev=34921&r1=34920&r2=34921
> ===
> ===
> ===
> =====================================================================
> --- trunk/TODO-1.6 Wed Dec 24 05:45:36 2008 (r34920)
> +++ trunk/TODO-1.6 Wed Dec 24 05:49:52 2008 (r34921)
> @@ -14,13 +14,12 @@ Blocker:
> if the text in sqlite.m4 about being able to use a sqlite/
> subdirectory is in any way true, etc etc)
>
> - * Tree conflicts - essential issues:
> -
> - - #3334: "Merry-go-round" about update updating the base.
> - Julian Foad has this under way in branch "tc-issue-3334".
> + * #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.
>
> - * Switch to skel for TC information, rather than using another
> - serialization format.
> + * #3343: Switch to skel for TC information, rather than using
> another
> + serialization format. (Also listed under "Optional". Not really
> a blocker?)
>
> * Test failures in tree conflicts tests on RA-Serf:
> <http://www.mobsol.be/buildbot/x86-macosx-gnu%2520shared%2520daily%2520ra_serf/builds/96
> >
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=991583
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=991722
Received on 2008-12-24 17:51:44 CET