Re: [libvirt] [PATCH] [PATCH]Correct syntax-check Using qemu with sheepdog pool

On 01/23/2014 10:46 AM, joel SIMOES wrote: This patch doesn't apply to libvirt.git: $ git am -3 ../pool.eml Applying: Correct syntax-check Using qemu with sheepdog pool fatal: sha1 information is lacking or useless (src/qemu/qemu_conf.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Correct syntax-check Using qemu with sheepdog pool The copy of the patch that failed is found in: /home/eblake/libvirt/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Is this a modification to a patch you posted earlier? If so, it's better to use git to squash the two patches into one (I use 'git rebase -i', then change 'pick' to 'squash' on the second patch in the editor it pulls up), and then repost a v2 of the correct patch to begin with. Having independent threads, where one thread tries to clean up a mess left in another, gets very hard to follow. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org