[libvirt] [PATCH 4/8] Moved SEXPR formatting functions to xenxs

[Eric Blake]

On 02/21/2011 06:40 AM, Markus Groß wrote:
> ---
>  src/xen/xend_internal.c   |  876 ---------------------------------------------
>  src/xen/xend_internal.h   |   12 -
>  src/xenxs/xen_sxpr.c      |  850 +++++++++++++++++++++++++++++++++++++++++++-
>  src/xenxs/xen_sxpr.h      |   32 ++
>  src/xenxs/xenxs_private.h |   18 +
>  tests/xml2sexprtest.c     |    1 +
>  6 files changed, 900 insertions(+), 889 deletions(-)

$ git am -3 ../xenxs.eml
Applying: Moved SEXPR formatting functions to xenxs
fatal: sha1 information is lacking or useless (src/xen/xend_internal.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Moved SEXPR formatting functions to xenxs


Would you mind rebasing and fixing this?  1-3 and 8 are in, but 4-7
could use some more attention.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20110221/e91aafe8/attachment-0001.sig>