Re: [translations] can't apply a patch

2013/9/8 David Kastrup <dak@xxxxxxx>

David Kastrup <dak@xxxxxxx> writes:

> Similar with simultaneous.ly. Now let's see when this changed:
>
> git log -p Documentation/it/notation/simultaneous.itely
> commit 48a57a1c8feb426029e059d9fbf8aaf1b14f0ff8
> Author: David Kastrup <dak@xxxxxxx>
> Date: Tue Aug 6 21:34:01 2013 +0200
>
> Run scripts/auxiliar/update-with-convert-ly.sh
>
> diff --git a/Documentation/it/notation/simultaneous.itely b/Documentation/it/not
> index 707c052..5d42e85 100644
> --- a/Documentation/it/notation/simultaneous.itely
> +++ b/Documentation/it/notation/simultaneous.itely
> @@ -7,7 +7,7 @@
> Guide, node Updating translation committishes..
> @end ignore
>
> -@c \version "2.17.6"
> +@c \version "2.17.25"
>
> [...]
>
>
> Let's do it the lazy way.
>
> dak@lola:/usr/local/tmp/lilypond$ git am /tmp/0001-Doc-it-proofread-chapters-1.3-1.4-1.5-of-Notation-Re.patch

Oops. Before doing that, I of course did

git checkout 48a57a1c8feb426029e059d9fbf8aaf1b14f0ff8~1

in order to return to a version where the patch would apply. Then apply
it, then rebase to origin again.

At any rate, don't forget to fix the whitespace errors.

I've fixed the whitespace errors and followed your instructions. The patch is applied correctly.

I'm testing 'make doc' on a virtual machine.

Thanks for the help, I think I'll have to use this method again soon.