Re: [jcvs] Merging with jCVS under Windoze

[Tim Endres <time@trustice.com>]

> Hi,
> 
> This sounds like it might be a FAQ but I haven't found any FGA
> (frequently given answers) on the jCVS web or in the
> documentation: When merging a modified file under windows-NT, if
> there are conflicts, jCVS seems to just produce a file
> containing both the complete file from the repository & the
> complete copy of the locally modified file one under the other.
> When performing a merge with the same file under UNIX (using
> plain cvs) only the small conflicting subsections of the file
> are marked and given in duplicate. Any ideas what's going on
> here or how to fix it? Is there some messing around with
> end-of-line characters happening by the connection or something
> like that? 

This is a problem with your repository. This does not happen when
the client and server are used with proper line termination.

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.

When you commit, the entire file has been changed on every line.
Thus, the total conflict file.

If these files were not marked as binary, then jCVS would be
performing the proper line termination conversion for you on
checkout and commit. This would cause you to see the same
correct behavior that you see under UNIX.

> Any help appreciated (we would like to use jCVS because it looks
> like a nice, user-friendly and portable product, however if we
> can't do proper merges then it's not worth having :-(

I perform proper merging all the time with jCVS without a problem.

Once you straighten out the line termination, most likely by
removing the binary tag from text files, then you will see the
correct behavior by jCVS.

tim.