Re: An unknown line type was found in line 188

Flex wrote:
> Stefan Küng wrote:
>> Flex wrote:
>>> Yep, it was in a zip uploaded to the free hosts. It has stranger
>>> lineendings indeed, but this confuses the merge? The part that
>>> confuses me most is that the same chunk of code that gives error with
>>> the 1.02 patch works fine in 1.00. I copied like 10 lines from the
>>> 1.00 to 1.02 with the same result. So the problem should lie
>>> somewhere else, far before line 188 or something... :(
>>
>> Please send the patchfile again but this time zipped. It really seems
>> that there's a problem with CR lineendings in there.
>> (and the mailer 'fixes' lineendings)
>>
> Here it is, however, the person said he had modified it by hand and I
> guess that has screwed it up. I'll know in the future to recheck and
> "rebuild" the lineendings when such thing happens ;)

Thanks for the patchfile. And yes, it really seems as if the file had
been modified manually - some lines were added but without adjusting the
@@... lines, so TMerge can't parse the file correctly anymore.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org