[Kimchi-devel] [PATCH V3] Change jQuery-ui from 1.10.3 to 1.11.2

[Aline Manera]

Still getting error while trying to apply it

alinefm at alinefm:~/kimchi$ git am -3 ../mail-patches/\[Kimchi-devel\]\ 
\[PATCH\ V3\]\ Change\ jQuery-ui\ from\ 1.10.3\ to\ 1.11.2.eml
Applying: Change jQuery-ui from 1.10.3 to 1.11.2
fatal: corrupt patch at line 249
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Change jQuery-ui from 1.10.3 to 1.11.2
The copy of the patch that failed is found in:
    /home/alinefm/kimchi/.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".

You can share a branch with me so I can get the patch from there.

On 09/01/2015 04:52, Wen Wang wrote:
> V2 -> V3:
> rebase
>
> V1 -> V2:
> Have the redundant images deleted compare to V1
>
> Signed-off-by: Wen Wang <wenwang at linux.vnet.ibm.com>
> ---
>   build-aux/compile                                  |   1 +
>   ui/libs/jquery-ui-i18n.min.js                      |  11 +++++-----
>   ui/libs/jquery-ui.min.js                           |  23 +++++++++++----------
>   ui/libs/themes/base/images/Makefile.am             |   2 +-
>   ui/libs/themes/base/images/animated-overlay.gif    | Bin 1738 -> 0 bytes
>   .../ui-bg_diagonals-thick_18_b81900_40x40.png      | Bin 0 -> 457 bytes
>   .../ui-bg_diagonals-thick_20_666666_40x40.png      | Bin 0 -> 351 bytes
>   .../base/images/ui-bg_flat_0_aaaaaa_40x100.png     | Bin 180 -> 0 bytes
>   .../base/images/ui-bg_flat_10_000000_40x100.png    | Bin 0 -> 244 bytes
>   .../base/images/ui-bg_flat_75_ffffff_40x100.png    | Bin 178 -> 0 bytes
>   .../base/images/ui-bg_glass_100_f6f6f6_1x400.png   | Bin 0 -> 301 bytes
>   .../base/images/ui-bg_glass_100_fdf5ce_1x400.png   | Bin 0 -> 387 bytes
>   .../base/images/ui-bg_glass_55_fbf9ee_1x400.png    | Bin 120 -> 0 bytes
>   .../base/images/ui-bg_glass_65_ffffff_1x400.png    | Bin 105 -> 246 bytes
>   .../base/images/ui-bg_glass_75_dadada_1x400.png    | Bin 111 -> 0 bytes
>   .../base/images/ui-bg_glass_75_e6e6e6_1x400.png    | Bin 110 -> 0 bytes
>   .../base/images/ui-bg_glass_95_fef1ec_1x400.png    | Bin 119 -> 0 bytes
>   .../images/ui-bg_gloss-wave_35_f6a828_500x100.png  | Bin 0 -> 5854 bytes
>   .../ui-bg_highlight-soft_100_eeeeee_1x100.png      | Bin 0 -> 317 bytes
>   .../ui-bg_highlight-soft_75_cccccc_1x100.png       | Bin 101 -> 0 bytes
>   .../ui-bg_highlight-soft_75_ffe45c_1x100.png       | Bin 0 -> 367 bytes
>   .../themes/base/images/ui-icons_222222_256x240.png | Bin 4369 -> 7006 bytes
>   .../themes/base/images/ui-icons_228ef1_256x240.png | Bin 0 -> 4599 bytes
>   .../themes/base/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
>   .../themes/base/images/ui-icons_454545_256x240.png | Bin 4369 -> 0 bytes
>   .../themes/base/images/ui-icons_888888_256x240.png | Bin 4369 -> 0 bytes
>   .../themes/base/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 0 bytes
>   .../themes/base/images/ui-icons_ef8c08_256x240.png | Bin 0 -> 4599 bytes
>   .../themes/base/images/ui-icons_ffd27a_256x240.png | Bin 0 -> 4599 bytes
>   .../themes/base/images/ui-icons_ffffff_256x240.png | Bin 0 -> 6468 bytes
>   ui/libs/themes/base/jquery-ui.min.css              |   9 +++++---
>   31 files changed, 26 insertions(+), 20 deletions(-)
>   create mode 120000 build-aux/compile
>   delete mode 100644 ui/libs/themes/base/images/animated-overlay.gif
>   create mode 100644 ui/libs/themes/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_diagonals-thick_20_666666_40x40.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_flat_10_000000_40x100.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_glass_100_f6f6f6_1x400.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_glass_100_fdf5ce_1x400.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_glass_75_dadada_1x400.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
>   delete mode 100644 ui/libs/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
>   create mode 100644 ui/libs/themes/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
>   create mode 100644 ui/libs/themes/base/images/ui-icons_228ef1_256x240.png
>   delete mode 100644 ui/libs/themes/base/images/ui-icons_2e83ff_256x240.png
>   delete mode 100644 ui/libs/themes/base/images/ui-icons_454545_256x240.png
>   delete mode 100644 ui/libs/themes/base/images/ui-icons_888888_256x240.png
>   delete mode 100644 ui/libs/themes/base/images/ui-icons_cd0a0a_256x240.png
>   create mode 100644 ui/libs/themes/base/images/ui-icons_ef8c08_256x240.png
>   create mode 100644 ui/libs/themes/base/images/ui-icons_ffd27a_256x240.png
>   create mode 100644 ui/libs/themes/base/images/ui-icons_ffffff_256x240.png
>