Re: [libvirt] [PATCH libvirt-python v3 00/40] Split python binding into separate repo

On Fri, Nov 22, 2013 at 04:22:24PM +0000, Daniel P. Berrange wrote: I got a failure to apply the patch set: Applying: Import LIBVIR_CHECK_VERSION macro from libvirt Patch is empty. Was it split wrong? If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". thinkpad:~/libvirt-python -> git am --skip Applying: Import some virTypedParams* APIs from libvirt .... Applying: VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK appeared in 1.0.0 fatal: sha1 information is lacking or useless (libvirt-override.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0031 VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK appeared in 1.0.0 The copy of the patch that failed is found in: /home/veillard/libvirt-python/.git/rebase-apply/patch I suggest you simply push your repo to libvirt.org git as libvirt-python.git and just send additional patches which are needed to cleanup the curent libvirt.git, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/