Re: CRLFs and Update/Checkout

Yeah, it does seem to be something to do with the diff/crlf activity.
Do you think the CVS admin (Entries, Root) files should be written
with a hardcoded '\n' or a File.lineTerminator? TortoiseCVS and CVSNT
have both dealt with this problem on Win32 before; they appear to
force use of a CRLF for all text output and do a conversion when
communicating to the server. If it comes to it, I'll contact them
about their approaches. 

Anyway, I'll dive into the code this week and see if I can come up
with anything. I'll report back when I have more info. 

Jeff


--- Milos Kleint <[email protected]> wrote:
> 
> yup. The CRLF conversions are a pain. if you want to dig into the
> code, check the cvsclient.file 
> package..
> 
> the algorithm for sending files to server during update is
> following:
> 1. check the timestamp on the file with the timestamp in the
> Entries file
> if they match, send the Unchanged request to server (the file
> itself is not sent at all and only 
> remote changes are taken into consideration based on the timestamp
> matchon the client and server)
> if they don't match, the file is considered lically modified and
> the content is sent to server to 
> resolve possible conflicts (that's when the CRLF stuff could
> matter.)
> 
> <rant>
> A general porblem with java is the old java.io package that doesn't
> effectively allow mixing 
> text-based protocol(processed per line) and binary-based data in
> one stream.. I believe the javacvs 
> library would be best rewritten using the javax.nio packages coming
> with JDK 1.4 that should fix the 
> inherent problems.
> it's also partly problem of cvs which is not client-server by
> default but rather by coincidence and 
> some hacking. For a VCS system that's close to cvs (possible
> replacement) without the cvs problems 
> see: http://subversion.tigris.org/ .. I've discovered the project
> just lately..
> </rant>

--snip--



__________________________________________________
Do You Yahoo!?
Yahoo! - Official partner of 2002 FIFA World Cup
http://fifaworldcup.yahoo.com