On Tue, 28 Oct 2014, Jon Trulson wrote:
> On Tue, 28 Oct 2014, Ulrich Wilkens wrote:
>
>> On 10/28/14 16:39, Jon Trulson wrote:
>>
>>> Hi, this patch failed to apply:
>>>
>>> error: patch failed:
>>> cde/programs/localized/it_IT.ISO8859-1/types/_common.dt.tmsg:1890
>>> error: cde/programs/localized/it_IT.ISO8859-1/types/_common.dt.tmsg:
>>> patch does not apply
>>>
>>
>> Hmm, it seems the problem is an UTF-8 character in one file.
>> So I created the same patch again but this time without the critical
>> file.
>
>
> Ok, I applied this one successfully, and it compiles fine. The patch
> error line (1890) was actually in the middle of a comment block just
> above the line you changed, so I assumed we just had different
> versions of this file...
>
>> And I created another patch with only the critical file. Though I'm
>> afraid that it won't apply again. I don't understand why this file
>> cannot be applied. It contains only one line that has to be changed.
>> But the line includes a character for a Latin small letter e with
>> grave (0xE8). I not even want to change this letter, only some others
>> in the same line. But git seems to have a problem with it.
>> Is it possible to change the file manually? At least for me git add
>> and git commit worked.
>>
>
> I could try to patch that file manually and see what happens.
>
Ok, made the change manually, that worked. Pushed.
--
Jon Trulson
"Don't believe everything you read on the internet."
--Abraham Lincoln
------------------------------------------------------------------------------
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
