Re: diff err

Jeff Cantin wrote:
> FYI, 
> Client running javacvs 3.3.1

you can't be using the 3.3.1 version.. the WriteRcsDiffFileProcessor was 
not there yet. it's only in the trunk..

and I think your analysis of the problem is correct..

Milos


> Server running Cvshome.org cvs v1.11.1p1
> 
> 
> --- Jeff Cantin <[email protected]> wrote:
> 
>>Anyone recognize this off the the cuff? 
>>
>>--------------
>>java.lang.Exception: wrong parsing..a0 15
>>        at
>>org.netbeans.lib.cvsclient.util.BugLog.bug(BugLog.java:58)
>>        at
>>org.netbeans.lib.cvsclient.file.WriteRcsDiffFilePreprocessor
>>        
>>.copyTextFileToLocation(WriteRcsDiffFilePreprocessor.java:119)
>>        at org.netbeans.lib.cvsclient.file.DefaultFileHandler
>>         .writeAndPostProcessTextFile(DefaultFileHandler.java:324)
>>        at org.netbeans.lib.cvsclient.file.DefaultFileHandler
>>         .writeRcsDiffFile(DefaultFileHandler.java:262)
>>---------------
>>
>>looks like this code in WriteRcsDiffFilePreprocessor doesn't like
>>the
>>'0' number in the diff line 'a0 15'. 
>>
>>---------------
>> else if (diff.charAt(0) == 'a') {
>>   // now add lines from the diff..
>>   int startLine = getStart(diff);
>>   int count = getLength(diff);
>>   if (startLine > 0 && count > 0) {
>>     readToLine(startLine, tempFileReader, writer);
>>     tempDiffReader.setLineNumber(0);
>>     readToLine(count, tempDiffReader, writer);
>>   }
>>   else {
>>     // BugLog..
>>     BugLog.getInstance().bug("wrong parsing.." + diff);
>>   }
>>-----------------
>>
>>My knowledge of the cvs protocol is limited, but is that diff line
>>valid? Should I change 'if (startLine > 0 && count > 0)' to 'if
>>(startLine >= 0 && count > 0)', or is there some incompatability
>>between my cvs server and the cvsclient? 
>>
>>thanks
>>Jeff
>>
>>
>>
>>__________________________________________________
>>Do You Yahoo!?
>>Yahoo! Health - your guide to health and wellness
>>http://health.yahoo.com
>>
>>
> 
> ---------------------------------------------------------------------
> 
>>To unsubscribe, e-mail: [email protected]
>>For additional commands, e-mail: [email protected]
>>
> 
> 
> 
> __________________________________________________
> Do You Yahoo!?
> Yahoo! Tax Center - online filing with TurboTax
> http://taxes.yahoo.com/
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
>