On Wed, Apr 23, 2008 at 05:14:42PM -0400, Christopher Faylor wrote: >On Wed, Apr 23, 2008 at 08:09:57PM +0200, Samuel Tardieu wrote: >>>>>>> "Christopher" == Christopher Faylor <[EMAIL PROTECTED]> writes: >> >>Christopher> After consultation with Dan, I have set things up on >>Christopher> gcc.gnu.org so that the git repository is updated every >>Christopher> time an email message is received from the gcc-cvs >>Christopher> mailing list. >> >>Christopher> We'll be monitoring the system to see if there is a load >>Christopher> hit. If so, we'll probably drop back to Dan's original >>Christopher> method. >> >>It looks like the GIT repository hasn't been synced since yesterday. >> > >Yes: > >Apr 23 20:41:28 sourceware error: invalid object >6c380017b3c68b8efc917ae3447e62b0fd76b009 >Apr 23 20:41:28 sourceware fatal: git-write-tree: error building trees; the >index is unmerged? >Apr 23 20:41:28 sourceware write-tree: command returned error: 128 > >What fun!
In case it isn't obvious, I don't know how to fix this. cgf
