[cairo] [PATCH] Fixed _cairo_surface_detach_mime_data in ecda633f887a10da650b4cd3efb17c861a6f519f.

[Chris Wilson]

On Fri, 29 Jan 2010 09:24:57 +0200, Alexander Shulgin <alex.shulgin at gmail.com> wrote:
> Hi,
> 
> while browsing the git log I've noticed a small mistake in the above
> commit.  Here's the patch to fix it (first finalize the array, then
> init from scratch):

Hard a weird error from git whilst trying to apply this patch:

Applying: Fixed _cairo_surface_detach_mime_data in
ecda633f887a10da650b4cd3efb17c861a6f519f.
fatal: sha1 information is lacking or useless (src/cairo-surface.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Fixed _cairo_surface_detach_mime_data in
ecda633f887a10da650b4cd3efb17c861a6f519f.

This seems to imply a fatal local error. Have I screwed up my repository?
/me runs git fsck.
Hmm, does not resolve the issue.

So I manually committed it, and pushed. Many thanks for your diligence in
getting the API fixed. :-)
-ickle

-- 
Chris Wilson, Intel Open Source Technology Centre