[Kimchi-devel] [PATCH 0/2] Remove useless files

Aline Manera alinefm at linux.vnet.ibm.com
Fri Aug 1 12:57:37 UTC 2014


On 08/01/2014 05:35 AM, Yu Xin Huo wrote:
> Aline, in my mail box, see below, patch 1/2 is missing.
>
>
> Only apply patch 2/2 failed.
>
> [root at oc7075156026 kimchi]# git am 
> /root/Desktop/patch-mail/jquery/\[Kimchi-devel\]\ \[PATCH\ 2_2\]\ 
> Remove\ useless\ jquery\ files.eml
> Applying: Remove useless jquery files
> fatal: corrupt patch at line 15123
> Patch failed at 0001 Remove useless jquery files
> When you have resolved this problem run "git am --resolved".
> 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".

Thanks for checking.
I will resend the patch set

>
>
> On 8/1/2014 12:54 PM, Aline Manera wrote:
>> Aline Manera (2):
>>    Remove useless image files
>>    Remove useless jquery files
>>
>>   contrib/kimchi.spec.fedora.in              |     2 -
>>   contrib/kimchi.spec.suse.in                |     2 -
>>   ui/images/progressing.gif                  |   Bin 1152 -> 0 bytes
>>   ui/images/theme-default/bg-black-linen.png |   Bin 84780 -> 0 bytes
>>   ui/images/theme-default/bg-navbar.png      |   Bin 3043 -> 0 bytes
>>   ui/js/jquery-ui.js                         | 14936 ---------------------------
>>   ui/js/jquery.min.js                        |     5 -
>>   7 files changed, 14945 deletions(-)
>>   delete mode 100644 ui/images/progressing.gif
>>   delete mode 100644 ui/images/theme-default/bg-black-linen.png
>>   delete mode 100644 ui/images/theme-default/bg-navbar.png
>>   delete mode 100644 ui/js/jquery-ui.js
>>   delete mode 100644 ui/js/jquery.min.js
>>
>
>
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/kimchi-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20140801/a75ebc75/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: image/png
Size: 3519 bytes
Desc: not available
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20140801/a75ebc75/attachment.png>


More information about the Kimchi-devel mailing list