Re: [jcvs] Merging with jCVS under Windoze

[Tim Endres <time@trustice.com>]

> > This is a problem with your repository. This does not happen when
> > the client and server are used with proper line termination.
> 
> Thanks for the quick response. I actually have no proof that the
> merge/conflicts problem is due to line termination (but this
> would seem to be the most obvious culprit). Are you using a
> pserver or an rsh connection? 

PServer and rsh both.

> Does this mean jCVS does perform
> some conversions of end-of-line characters?

Absolutely.

> It must do something
> different to the plain UNIX version since physically copying the
> file to a UNIX system and performing a merge with cvs works find.

This is evidence that line termination conversion is not taking place.
Which would be an error.

> > It sounds to me like you have the files marked as "binary" (or
> > with -kb), and when you check them out under Windows, those files
> > are converted by your text editor to have proper line termination,
> > as opposed to UNIX line termination.
> 
> They are not marked as binary. In any case I would have thought
> that cvs does not even attempt to perform a merge for files
> marked with -kb, as that is pretty meaningless for any proper
> binary files.

Since the files are run through gnu's diff, the diff may smart
enough to recognize the files as text. I am not certain about
that however.

You should perform a status on the files. This will indicate the
flags with the 'Sticky Options:' line. If you have this:

   Sticky Options:	-kb

then you have the binary flag set.

Or, you can use a binary editor to view the files immediately after
checkout (before any text editor opens them) and determine the line
termination for sure.

tim.