[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: An unknown line type was found in line 188

From: Flex <flex_at_datecs.bg>
Date: 2006-09-22 20:29:03 CEST

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... :(

Stefan Küng wrote:
> Flex wrote:
>> I haven't made the patch, but the author is not responding. His first
>> version patches okay, it has the same block of lines around but it
>> passes... so I though they are fine? I'm attaching the working ver
> Yes, that one is ok.
> Did the author send you the patchfile zipped? In my experience, mail
> programs often mess around with patchfiles because they think they're
> normal text. They then 'fix' e.g. lineendings, empty lines (lines
> consisting of only spaces and/or tabs are stripped), ...
> And that of course completely messes up the patchfile so that
> TortoiseMerge can't apply it anymore.
> Stefan

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 22 20:29:14 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.