[cairo] [PATCH] Fixed _cairo_surface_detach_mime_data in ecda633f887a10da650b4cd3efb17c861a6f519f.

[Carl Worth]

On Fri, 29 Jan 2010 09:25:19 +0000, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> 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?

I don't think so. I think this means the following:

	1. There's a merge conflict between the patch and what you have
	   in your tree, so

	2. Git attempted a 3-way merge based on the parent objects
	   referenced in the patch, but

	3. Your repository happens to not have all of those objects.

This could happen if the patch submitter just happened to have made a
simple change to the same file in a commit prior to the one being sent,
and you never saw *that* commit.

It's cases like this where a git-pull rather than a patch through email
will likely be more successful.

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

But that works too. :-)

-Carl
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.cairographics.org/archives/cairo/attachments/20100219/73e3cf32/attachment.pgp