From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Fabian Braennstroem Newsgroups: gmane.emacs.help Subject: Re: problem with diffs in cvs Date: Wed, 09 Jun 2004 15:54:17 +0200 Organization: Braennstroem Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <878yewalbq.fsf@tfdpc12.tfd.chalmers.se> References: <878yeyin6y.fsf@tfdpc12.tfd.chalmers.se> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1088535103 15858 80.91.224.253 (29 Jun 2004 18:51:43 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 29 Jun 2004 18:51:43 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Jun 29 20:51:36 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BfNhf-0002r2-00 for ; Tue, 29 Jun 2004 20:51:35 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BfNjL-00006e-8L for geh-help-gnu-emacs@m.gmane.org; Tue, 29 Jun 2004 14:53:19 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!newsfeed.icl.net!proxad.net!newsfeed.stueberl.de!fu-berlin.de!uni-berlin.de!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 68 Original-X-Trace: news.uni-berlin.de W0byWTcKa0txXgSgbE+Bmg07ubJBoOkKXqm4fh/OtdS2OCqQ6u X-Orig-Path: tfdpc12.tfd.chalmers.se!news Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAQMAAABtzGvEAAAAA1BMVEUA/wA0XsCoAAAADUlE QVR4nGNgGAXUBAABUAAB6+YoyQAAAABJRU5ErkJggg== User-Agent: Gnus/5.110001 (No Gnus v0.1) Emacs/21.3 (gnu/linux) Cancel-Lock: sha1:XeUeGYXUXl6Mk0o1zEW0a6kSh5A= Original-Xref: shelby.stanford.edu gnu.emacs.help:123708 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:19076 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:19076 LEE Sau Dan writes: >>>>>> "Fabian" == Fabian Braennstroem 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 > > Basically, you use and 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