emms-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emms-patches] Re: [PATCH] emms-player-vlc: Fix command line arguments t


From: Tim Landscheidt
Subject: [Emms-patches] Re: [PATCH] emms-player-vlc: Fix command line arguments to work on Mac OS X and clean white space
Date: Mon, 28 Jun 2010 11:18:41 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux)

Lucas Bonnet <address@hidden> wrote:

>   I can't apply the patch directly, both git and patch complain that the
> patch is corrupt. Can someone else with commit rights try and tell me if
> it's working for them?

It's not, as there are various lines not starting with "-",
"+" or " ". Still, when I added those, neither git am nor
patch were happy:

| address@hidden ~/src/emms]$ git am /var/tmp/patch.msg
| Applying: emms-player-vlc: Fix command line arguments to work on Mac OS X and 
clean white space
| error: patch failed: lisp/emms-player-vlc.el:31
| error: lisp/emms-player-vlc.el: patch does not apply
| Patch failed at 0001 emms-player-vlc: Fix command line arguments to work on 
Mac OS X and clean white space
| 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".
| address@hidden ~/src/emms]$ git am --abort
| address@hidden ~/src/emms]$ patch -p1 < /var/tmp/patch.txt
| patching file lisp/emms-player-vlc.el
| Hunk #1 FAILED at 31.
| Hunk #2 FAILED at 47.
| 2 out of 2 hunks FAILED -- saving rejects to file lisp/emms-player-vlc.el.rej
| address@hidden ~/src/emms]$

Tim




reply via email to

[Prev in Thread] Current Thread [Next in Thread]