Re: [translations] New set of Catalan translations |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Translations Lilypond <translations@xxxxxxxxxxx>
- Subject: Re: [translations] New set of Catalan translations
- From: Walter Garcia-Fontes <walter.garcia@xxxxxxx>
- Date: Fri, 12 May 2017 11:22:15 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=upf.edu; s=google; h=date:from:to:subject:message-id:reply-to:references:mime-version :content-disposition:in-reply-to:organization:user-agent; bh=53Obbll0RFHYhbozi3/vjq10lX8Gfx730JvGVHG0r1U=; b=ARfJMP+CJ8Jb3oGzNLES3wFPOAQLTWvGnE+1NrYrAIq15eIkfQaPfjfqHzfRVlBoM3 mjFbEYEV0go0zMwAOFdpLEjhFnVsbVYoiDidx/OUsmdb9RE4/BFfwUxTFMtTMNbR9oDs 0xxP7G7Jkqq1nujC/s6VVi9G6tZviWoyyre/U=
- Organization: Departament of Economics and Business, Universitat Pompeu Fabra
I took a look to my set of patches, and there is something I don't
understand.
As far as I can tell I did all the process right. I have my own
branch, created from the translation branch, I worked there. When I
finished I went back to the translation branch, updated it with
"pull", then when back to my branch, rebased it with translation
without errors, and generated my patches.
Since I was told that the patches could not be applied against the
translation branch I checked it myself. I cloned a new repository,
checked out the translation branch, and tried to apply my patches.
They fail because some lines in the patches have trailing
whitespaces, at 6 or 7 lines.
So I went back to my branch and checked if those trailing whitespaces
were in the corresponding files, but they are not there, but when I
generate my patches (with "git format-patch origin") they are
introduced. How come? I tried to erase the trailing whitespace
directly in the patches but they still fail to apply.
Thanks,
--
Walter Garcia-Fontes