help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: problem with diffs in cvs


From: Fabian Braennstroem
Subject: Re: problem with diffs in cvs
Date: Tue, 29 Jun 2004 17:36:15 -0000
User-agent: Gnus/5.110001 (No Gnus v0.1) Emacs/21.3 (gnu/linux)

LEE Sau Dan <address@hidden> writes:

>>>>>> "Fabian" == Fabian Braennstroem <address@hidden> writes:
>
>     Fabian> Hello, I have somehow problems to show the diffs for my
>     Fabian> cvs-files with pcl-cvs. Using the interactive diff (or
>     Fabian> other diffs)
>
> Interactive diff?  Is it ediff?

Yes it is ediff (at least there is a buffer called 'Ediff Control Panel') It is
the diff-programm which I use after I started to 'examine' my directory with
pcl-cvs. When I than display the cvs-log-file for all files and then choose
from the new cvs-menu 'interactive diff' for one file, e.g. main.f, two new
buffers are opened called 'main.f' and 'main.f.BASE' which should show the
differences, but they are exactly the same. In my cvs-log the revisions for
'main.f' go up to 1.10 each with an on log-entry about the changes I made.

Even doing 'cvs diff -r 1.9 -r 1.10 main.f' on the console shows me that there
are differences between 1.9 and 1.10:

 
Index: main.f
===================================================================
RCS file: /home/fab/cvsroot/Simulation/16/code/main.f,v
retrieving revision 1.9
retrieving revision 1.10
diff -r1.9 -r1.10
299d298
<
300a300
 
305,335c305,335
< c print x & y
<       ni=82
<       if (nvisit.eq.0) then
< ...
< ...
---
c$$$c print x & y
c$$$      ni=82
c$$$      if (nvisit.eq.0) then
...
...


Isn't that strange!? By the way, ViewCVS does not show the diffs too.

>
>
>     Fabian> I don't see any differences at all, but the log file
>     Fabian> shows clearly the different revisions with my logs which I
>     Fabian> check in with 'C-x v v'.
>
> You need to  spend some time with the  manual of the ediff: C-h  i d m
> ediff <RET>
>
> Basically, you use <SPACE>  and <BACKSPACE> to navigate the difference
> in ediff, and press 'q' to quit.

Yes, I have to do it, but as I mentioned above, there are none :-(


Greetings!
 
-- 
Fabian Braennstroem
Duesseldorf/Berlin


reply via email to

[Prev in Thread] Current Thread [Next in Thread]