Re: Python hacker emergency on git-cl

[David Kastrup]

Thomas Morley <address@hidden> writes:

> 2012/12/2 Thomas Morley <address@hidden>:
>> 2012/12/2 Reinhold Kainhofer <address@hidden>:
>>> On 2012-12-02 12:50, Thomas Morley wrote:
>>>>
>>>> Trying to upload a new patch set for issue 2966, I ran into said
>>>> git-cl-issue.
>>>> Using LilyDev, I tried to apply Reinholds patch (after storing it in
>>>> git-cl.diff), but the terminal returns:
>>>>
>>>> address@hidden ~/lilypond-git (dev/local_working)$ git apply git-cl.diff
>>>> error: git-cl: No such file or directory
>>>> error: upload.py: No such file or directory
>>>>
>>>> What's wrong and how to proceed?
>>>
>>>
>>> Are you trying to apply it to the lilypond source code? It should be applied
>>> to your git-cl checkout...
>
> Think I found it in
> ~/src/git-cl
> but now I've got:
>
> address@hidden ~/src/git-cl (master)$ git apply git-cl.diff
> error: patch failed: git-cl:646
> error: git-cl: patch does not apply

Do

git pull -r

first to get your patch up-to-date.  Also I would recommend saving the
mail with the [PATCH] subject that I sent, then running

git am name-of-saved-mail

on it.  This will not apply a patch (for which you need to create commit
message and stuff) but rather directly take the commit I formatted, both
commit message and patch.

-- 
David Kastrup