My cvs client is "cvs" running under Cygwin. I have it on good terms that this is "the" cvs client to use so I cannot see why this would be a problem. My editor is, oddly enough, Microsoft Visual Studio. I know for a fact that this is the only suitably editor.
I've never had a problem before, (in fact I don't see any problem at my end). What *might* be happening is that my cvs client, by default, is using unix-style line endings for text files (files without the -kb flag), which is absolutely fine for Visual Studio but possibly incompatible with WinCVS which I'm guessing assumes the files in cvs have CRLF line endings, and I'm further guessing that WinCVS gets confused when merging the changes. Which files were / were not borked? d ----- Original Message ----- From: "Reuben Balik" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Wednesday, June 12, 2002 10:48 PM Subject: Re: [freenet-dev] Moving NodeConfig with right mouse button > Okay, commited the line break fixes. Oddly enough, > only some of the files that you edited had problems so > it might not be a problem with your cvs client. What > editor are you using? > > --Reuben > --- Dave Hooper <[EMAIL PROTECTED]> wrote: > > Ok, actually, I just implemented it. > > I'll check the code into cvs when I get back from > > the pub. > > > > Turns out in practice you need to do *both* of what > > I said. Anyway. > > > > d > > > > > > _______________________________________________ > > devl mailing list > > [EMAIL PROTECTED] > > > http://hawk.freenetproject.org/cgi-bin/mailman/listinfo/devl > > > __________________________________________________ > Do You Yahoo!? > Yahoo! - Official partner of 2002 FIFA World Cup > http://fifaworldcup.yahoo.com > > _______________________________________________ > devl mailing list > [EMAIL PROTECTED] > http://hawk.freenetproject.org/cgi-bin/mailman/listinfo/devl > _______________________________________________ devl mailing list [EMAIL PROTECTED] http://hawk.freenetproject.org/cgi-bin/mailman/listinfo/devl
