Re: [jcvs] Merging with jCVS under Windoze

["Jay Colson" <jcolson@activedataX.com>]

What proggie are you using to edit the file on the Windoze side?  I believe what
Tim is saying is that the file (when checked out/updated) comes over to Windoze
fine (does for me at least, ie, with no \r\n), however when you actually EDIT
the file, whatever editor you are using is converting the carriage returns to
carriage return/line feeds, so when you try to commit EVERY line is actually
different according to CVS.

As far as a straight text editor in a Windoze environment, I suggest UltraEdit,
as it will recognize Unix type files and leave them alone.

If you are using an IDE, what is it?

J








Andreas Ernst <Andreas.Ernst@cmis.CSIRO.AU> on 05/30/2000 12:17:48 AM
                                                                                
                                                                                
                                                                                


                                                              
                                                              
                                                              
 To:      Tim Endres <time@trustice.com>                      
                                                              
 cc:      jcvs@career.gjt.org(bcc: Jay Colson/Rnci)           
                                                              
                                                              
                                                              
 Subject: Re: [jcvs] Merging with jCVS under Windoze          
                                                              








> 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

--------------------------------------------------------------------
View List Archive:   <http://www.gjt.org/mlist/jcvs/threads.html>
Search List Archive: <http://csdl.ics.hawaii.edu:8100/>
To unsubscribe from this list:
   <http://www.gjt.org/servlets/MailingLists/UnsubForm.html/jcvs>