CVS diff always reports files are identical

Is there anything special you need to do to get CVS diff (pserver) to work? When I try to use it, it always says "files are identical", even though they blatantly aren't. This has been happening since build 674.

Thanks!

10 comments
Comment actions Permalink

Daniel Aborg schrieb:

Is there anything special you need to do to get CVS diff (pserver)

> to work? When I try to use it, it always says "files are identical",
> even though they blatantly aren't. This has been happening since
> build 674.

hmm, do not think so. It is working for me all right.

Two ideas:

  • It compares with a specified version. Try to replace your version with

"HEAD" to have it get track with other people's changes.

  • You may have disabled the dialogue asking for this version. Re-enable

it in IDE Sessings/VCS/Advances.

HTH,
Karsten
--
Karsten Tinnefeld tinnefeld@adesso.de
adesso AG
Stockholmer Allee 24 T +49 231 9309211
44269 Dortmund, Deutschland M +49 172 4542646 F +49 231 9309331

0
Comment actions Permalink

Im running build 695 and have been having the same problem as Daniel Aborg.

When I do a diff, it always pops up a dialog box saying "files are identical".. but when I look at the Console tab on the Cvs window, there are numerous changes in the form of a standard unified diff.

I have checked the project settings as suggested, and they are as suggested (diff dialog box is ticked to show and I am diffing against HEAD), and information is definatly being passed back to Idea as it shows in the Console log window... however Idea just doesnt seem to want to take notice.

I am using pserver settings, and I have no problem with other CVS communication via Idea (checkout, update, commmit, add, remove etc).

Ideas anyone?

0
Comment actions Permalink

I recently had a bit of confusion that may be relevant. I had a file that
was marked as modified in the CVS window, but when I did a CVS diff, the
file was reported as identical. It turned out that I still had (recalling
exact text from memory) "Ignore whitespace differences " checked from a
previous diff.

You might want to double-check that something similar isn't happening to
you.

"Dan Hardiker" <jiveadmin@jetbrains.com> wrote in message
news:30191380.1046014023225.JavaMail.javamailuser@localhost...

Im running build 695 and have been having the same problem as Daniel

Aborg.
>

When I do a diff, it always pops up a dialog box saying "files are

identical".. but when I look at the Console tab on the Cvs window, there are
numerous changes in the form of a standard unified diff.
>

I have checked the project settings as suggested, and they are as

suggested (diff dialog box is ticked to show [although that shouldnt pose a
problem if it was off] and I am diffing against HEAD), and information is
definatly being passed back to Idea as it shows in the Console log
window... however Idea just doesnt seem to want to take notice.
>

I am using pserver settings, and I have no problem with other CVS

communication via Idea (checkout, update, commmit, add, remove etc).
>

Ideas anyone?



0
Comment actions Permalink

Ignore whitespace is on (because I dont want to see those differences) ... but there are major code and comment changes (eg: new methods) - which are shown in the Console window but Idea still thinks they are the same.

I havent manage to get Idea to show a successful diff ever... not matter how much has changed.

Any other ideas... more to the point anyone managed to do this successfully? (diff) ... if so can you provide details of your project makeup?

0
Comment actions Permalink

Another thing to check... When I first started using IDEA, all my diffs
were returning "No differences".

After some investigation, I found out the problem was that I had a line with
"diff -u" in my .cvsrc file (because I like unified context diffs) and
IDEA's diff tool seems to gag on context diffs. I had to remove the
"diff -u" line from my .cvsrc file to make IDEA happy. :(

"Dan Hardiker" <jiveadmin@jetbrains.com> wrote in message
news:28511431.1046113679129.JavaMail.javamailuser@localhost...

Ignore whitespace is on (because I dont want to see those differences) ...

but there are major code and comment changes (eg: new methods) - which are
shown in the Console window but Idea still thinks they are the same.
>

I havent manage to get Idea to show a successful diff ever... not matter

how much has changed.
>

Any other ideas... more to the point anyone managed to do this

successfully? (diff) ... if so can you provide details of your project
makeup?


0
Comment actions Permalink

Woohoo ... ish

You were right, in my profile directory I had my ".cvsrc" file with "diff -u" in it. This has now been removed.



Unfortunatly this has had no effect. Im experiancing the same problem ("Identical Files" error) and this appears in the Console:

C:\cvs.exe -z 9 -q diff -r HEAD -w DatabaseHandler.java
Index: DatabaseHandler.java
===================================================================
RCS file: /cvsroot/adam5r5/src/net/eorigen/adas/DatabaseHandler.java,v
retrieving revision 1.6
diff -u -w -r1.6 DatabaseHandler.java
--- DatabaseHandler.java 24 Feb 2003 18:05:32 -0000 1.6
+++ DatabaseHandler.java 25 Feb 2003 09:40:07 -0000
@@ -397,11 +397,11 @@
// Pull the data for this column
String nameSet = meta.getColumnName(col);
String dataSet = result.getString(col);
+ // Is this a core field?
// Insert the data into the adam object
if (dataSet != null) {
data.setProperty( nameSet, dataSet );
}
- // Is this a core field?
// Tense ID
if ("tense_id".equals(nameSet)) {
data.setTenseID( dataSet );

CVS command finished execution


As you can see from the command, -u is still being passed to the diff. I have scanned my harddrive for any other cvsrc files lying around, and have found none. There are no environment settings which could/would pass -u to diff. In idea's project config, "Other global options" only has "-q" in it. No external diff program has been entered.

The diff's coming back are definatly unified... My only guess is Idea is forcing the switch? Any ideas?

0
Comment actions Permalink

As I was using a :pserver: my remote .cvsrc was also taking effect. After removing -u from that .cvsrc file as well, it now functions.

Any idea who I would goto / where I would post a feature request asking that Idea be able to handle the most common form of diff's know to version control? (unified ones)

0
Comment actions Permalink

You should go to the IntelliJ Technology Network (http://www.intellij.net/).
There you can find the bug tracker database for IDEA, an web version of the
IntelliJ newsgroups, and a link to a useful Wiki for IDEA.

"Dan Hardiker" <jiveadmin@jetbrains.com> wrote in message
news:28318025.1046168388047.JavaMail.jrun@is.intellij.net...

Any idea who I would goto / where I would post a feature request asking

that Idea be able to handle the most common form of diff's know to version
control? (unified ones)


0
Comment actions Permalink

Kendall Collett wrote:

You should go to the IntelliJ Technology Network (http://www.intellij.net/).
There you can find the bug tracker database for IDEA, an web version of the
IntelliJ newsgroups, and a link to a useful Wiki for IDEA.

"Dan Hardiker" <jiveadmin@jetbrains.com> wrote in message
news:28318025.1046168388047.JavaMail.jrun@is.intellij.net...

>>Any idea who I would goto / where I would post a feature request asking


that Idea be able to handle the most common form of diff's know to version
control? (unified ones)


Dan,

Please post the tracker number for the request you create. I just ran
into this same problem and discovered the same solution (remove diff -u
from .csrc). I would like to put my votes to work for your tracker
request 8)

Ciao,
Gordon

--
Gordon Tyler
Software Developer, R&D
Sitraka (now part of Quest Software)
"Performance is Mission Critical"

0
Comment actions Permalink

You can get to the Feature Request by following the url http://www.intellij.net/tracker/idea/viewSCR?publicId=10077

Vote as you see fit :)

0

Please sign in to leave a comment.