CVSNT settings question
I am working on a shared Java project in Eclipse. The project is shared by CVSNT (www.cvsnt.org). CVSNT has been installed on a server with the standard configuration. The necessary users has been created using the Windows login users. It works fine. But when we are working on the same class and try to update, there are offent some conflicts. It seems like the cvs makes a line-by-line comparison of the code. I was hoping it would a module-by-module comparison instead. Is this possible and if so, how and where is this change possible?
Hope this is a relevant forum!
Nope, that question has nothing to do with Java, but with CVS itself (it's not even a CVSNT specific problem, you'll come across this behaviour, no matter what CVS server you'll use).
What do you mean by module-by-module comparison? In my setting it first tells me which files have conflicts and then shows me what conflicts that are ... The client can try to display that in a nicer way (as Eclipse does), but that's basically what CVS does.
I mean, comparison of the methods, etc. of a class instead of a line-by-line comparison (skipping comments etc.).
The reason for my question, is that one of the other developers in the project has experienced a module-by-module comparison in an earlier cvs setup (in unix), but this wasn磘 installed by him, so he does not really know the details. Neither do I, as you can read ;-)
Anyway, thanks for your prompt answer.
there is a great utility for windows to the the recursive diffing, CSDiff. Find it at http://www.componentsoftware.com/csdiff/intro.htmAlso, Java Studio will take care of cvs and diffing for you. The support in Java STudio Enterprise 8 is terrific.
