Re: [jcvs] Merging with jCVS under Windoze

[Andreas Ernst <Andreas.Ernst@cmis.CSIRO.AU>]

> 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?  Does this mean jCVS does perform
some conversions of end-of-line characters? 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.

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

Andreas