From owner-freebsd-cvsweb@FreeBSD.ORG  Tue Jan 10 15:43:29 2006
Return-Path: <owner-freebsd-cvsweb@FreeBSD.ORG>
X-Original-To: freebsd-cvsweb@freebsd.org
Delivered-To: freebsd-cvsweb@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3ED3D16A41F
	for <freebsd-cvsweb@freebsd.org>; Tue, 10 Jan 2006 15:43:29 +0000 (GMT)
	(envelope-from daniel.leidert.spam@gmx.net)
Received: from mail.gmx.net (mail.gmx.de [213.165.64.21])
	by mx1.FreeBSD.org (Postfix) with SMTP id E80B643D45
	for <freebsd-cvsweb@freebsd.org>; Tue, 10 Jan 2006 15:43:27 +0000 (GMT)
	(envelope-from daniel.leidert.spam@gmx.net)
Received: (qmail invoked by alias); 10 Jan 2006 15:43:26 -0000
Received: from unknown (EHLO test.wgdd.de) [195.227.105.180]
	by mail.gmx.net (mp034) with SMTP; 10 Jan 2006 16:43:26 +0100
X-Authenticated: #17381962
Received: from localhost ([127.0.0.1] ident=dl)
	by test.wgdd.de with esmtp (Exim 3.36 #1 (Debian))
	id 1EwLea-0005jc-00
	for <freebsd-cvsweb@freebsd.org>; Tue, 10 Jan 2006 16:43:20 +0100
From: Daniel Leidert <daniel.leidert.spam@gmx.net>
To: ml_cvsweb <freebsd-cvsweb@freebsd.org>
Content-Type: text/plain
Organization: TU Dresden
Date: Tue, 10 Jan 2006 16:43:20 +0100
Message-Id: <1136907800.19778.19.camel@localhost>
Mime-Version: 1.0
X-Mailer: Evolution 2.4.2.1 
Content-Transfer-Encoding: 7bit
X-Y-GMX-Trusted: 0
Subject: Bug in cvsweb?
X-BeenThere: freebsd-cvsweb@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS Web maintenance mailing list <freebsd-cvsweb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>, 
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-cvsweb>
List-Post: <mailto:freebsd-cvsweb@freebsd.org>
List-Help: <mailto:freebsd-cvsweb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-cvsweb>,
	<mailto:freebsd-cvsweb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2006 15:43:29 -0000

Hello,

Short question: The diff in cvsweb produces a different output than the
'cvs diff' command on console in the case of using self defined local
keywords or the CVSHeader keyword. A sample:

> cvs diff -u -r 1.5 -r 1.6 test2
> Index: test2
> ===================================================================
> RCS file: /cvs/private/test/test2,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- test2       10 Jan 2006 15:36:03 -0000      1.5
> +++ test2       10 Jan 2006 15:36:24 -0000      1.6
> @@ -1,4 +1,4 @@
> -$WgDD: test/test2,v 1.5 2006/01/10 15:36:03 dleidert Exp $
> +$WgDD: test/test2,v 1.6 2006/01/10 15:36:24 dleidert Exp $
> 
> -old 1.4
> -new 1.5
> +old 1.5
> +new 1.6

This looks ok. Now the same shown in cvsweb:
http://cvs.wgdd.de/cgi-bin/cvsweb/test/test2.diff?r1=1.5;r2=1.6

> --- /var/lib/cvsd/cvs/private/test/test2	2006/01/10 15:36:03	1.5
> +++ /var/lib/cvsd/cvs/private/test/test2	2006/01/10 15:36:24	1.6
> @@ -1,4 +1,4 @@
> -$WgDD: test/test2,v 1.4 2006/01/02 21:22:17 dleidert Exp $
> +$WgDD: test/test2,v 1.5 2006/01/10 15:36:03 dleidert Exp $
>  
> -old 1.4
> -new 1.5
> +old 1.5
> +new 1.6

Do you see the difference in the diffs showing the changes for the local
keyword? Is it a bug or "feature" in cvsweb? Or do I have to search the
reason for this issue in another package?

Regards, Daniel