On Fri, 21 Jun 2002, Scott Sirovy wrote: > > Every time I run CVS Diff from IDEA, it tells me "the two files are > > identical", even if I just changed the file. The status bar says "CVS > > 'Diff' command completed with exit code 1". I don't use an external > > diff program. > > Has it never worked for you? Did you just start using CVS within IDEA? Did > you change something in your project config?
I've used CVS within IDEA for a couple months and it has never worked for me. (Until now; see below.) > What do you mean you don't use an external diff program? You told us your > path to the cvs executable, did you also tell IDEA where it is? It uses the > command line version to do the work, of course. (Answer moot, see below.) Idea asks for your CVS executable (yes I told it where that is) and also has an option for using an "external diff program" which I left unchecked and unspecified. > When I run CVS commands from within IDEA the command, its parameters, and > results are all dumped to the CVS console window. Have you checked there? > What are the results? > > You are correct, thougth, that IDEA reports "the two files are identical" > whenever it can't properly process the CVS results. I'd venture a guess > that there is something wrong while IDEA tries to run the cvs client and > pass it some parameters. Check the console for any error messages, etc. > Thanks, Scott, that's very helpful. I managed to track down the problem. In my .cvsrc file I had the line "diff -uN" because I like to look at my command-line diffs in unified diff format. That was, apparently, confusing IDEA. When I removed that, I got to see the pretty DIFF interface that IDEA has! Thanks again, David _______________________________________________ Eap-bugs mailing list [EMAIL PROTECTED] http://lists.jetbrains.com/mailman/listinfo/eap-bugs
